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

history: rename merge method to domerge

avoid naming conflict with merge module

Changeset 6341a0155b9e…

Parent f6426bc56b98…

by Steve Borho

Changes to one file · Browse files at 6341a0155b9e Showing diff from parent f6426bc56b98 Diff from another changeset...

Change 1 of 3 Show Entire File hggtk/​history.py Stacked
 
473
474
475
476
 
477
478
479
 
514
515
516
517
 
518
519
520
 
1059
1060
1061
1062
 
1063
1064
1065
 
473
474
475
 
476
477
478
479
 
514
515
516
 
517
518
519
520
 
1059
1060
1061
 
1062
1063
1064
1065
@@ -473,7 +473,7 @@
  m.append(create_menu(_('di_splay change'), self.show_status))   m.append(create_menu(_('diff to local'), self.vdiff_local))   m.append(create_menu(_('_update'), self.checkout)) - self.cmenu_merge = create_menu(_('_merge with'), self.merge) + self.cmenu_merge = create_menu(_('_merge with'), self.domerge)   m.append(self.cmenu_merge)   m.append(create_menu(_('_copy hash'), self.copy_hash))   m.append(create_menu(_('_export patch'), self.export_patch)) @@ -514,7 +514,7 @@
  self.bundle_revs))   m.append(create_menu(_('export patches from here to selected'),   self.export_revs)) - self.cmenu_merge2 = create_menu(_('_merge with'), self.merge) + self.cmenu_merge2 = create_menu(_('_merge with'), self.domerge)   m.append(self.cmenu_merge2)     # need transplant extension for transplant command @@ -1059,7 +1059,7 @@
  if not oldparents == newparents:   self.refresh_model()   - def merge(self, menuitem): + def domerge(self, menuitem):   rev = self.currevid   parents = [x.node() for x in self.repo.parents()]   if rev == self.repo.parents()[0].rev():