Kiln » TortoiseHg » TortoiseHg
Clone URL:  
Pushed to one repository · View In Graph Contained in 0.8.2, 0.8.3, and 0.9

stable merge with stable

Changeset fd01a9e93088…

Parents 48b3beacadef…

Parents ab212f172fb0…

by Giampaolo Fadel

Changes to 3 files · Browse files at fd01a9e93088 Showing diff from parent 48b3beacadef ab212f172fb0 Diff from another changeset...

Change 1 of 2 Show Entire File hggtk/​hgtk.py Stacked
 
658
659
660
661
 
662
663
664
 
685
686
687
688
 
689
690
691
 
658
659
660
 
661
662
663
664
 
685
686
687
 
688
689
690
691
@@ -658,7 +658,7 @@
  [('l', 'limit', '', _('limit number of changes displayed'))],   _('hgtk log [OPTIONS] [FILE]')),   "^merge": (merge, - [('r', 'rev', '', _('revision to update'))], + [('r', 'rev', None, _('revision to merge with'))],   _('hgtk merge')),   "^recovery|rollback|verify": (recovery, [], _('hgtk recovery')),   "^shelve|unshelve": (shelve, [], _('hgtk shelve')), @@ -685,7 +685,7 @@
  ('', 'all', None, _('udpate all repos in current dir')) ],   _('hgtk thgstatus [OPTION]')),   "^update|checkout|co": (update, - [('r', 'rev', '', _('revision to update'))], + [('r', 'rev', None, _('revision to update'))],   ('hgtk update')),   "^vdiff": (vdiff,   [('c', 'change', '', _('changeset to view in diff tool')),
Change 1 of 1 Show Entire File hggtk/​update.py Stacked
 
50
51
52
53
 
54
55
56
 
50
51
52
 
53
54
55
56
@@ -50,7 +50,7 @@
  combo = gtk.combo_box_entry_new_text()   hbox.pack_start(combo, True, True, 2)   vbox.pack_start(hbox, False, False, 10) - if rev: + if rev != None:   combo.append_text(str(rev))   else:   combo.append_text(_branch_tip_)
Change 1 of 1 Show Entire File win32/​shellext/​ContextMenu.cpp Stacked
 
517
518
519
 
520
 
 
 
 
521
522
523
 
517
518
519
520
521
522
523
524
525
526
527
528
@@ -517,7 +517,12 @@
  }   else if (uFlags == GCS_VERBW || uFlags == GCS_VERBA)   { +#if 0   psz = iter->second.name.c_str(); +#else + // bugfix: don't provide verbs ("rename" conflicted with rename of explorer) + psz = ""; +#endif   res = S_OK;   }   else if (uFlags == GCS_VALIDATEW || uFlags == GCS_VALIDATEA)