Kiln » TortoiseHg » TortoiseHg
Clone URL:  
Pushed to one repository · View In Graph Contained in 0.7, 0.7.1, and 0.7.2

history: allow merges even when repo has one head

Changeset ce465921a377…

Parent 459e4e568641…

by Steve Borho

Changes to one file · Browse files at ce465921a377 Showing diff from parent 459e4e568641 Diff from another changeset...

Change 1 of 1 Show Entire File hggtk/​history.py Stacked
 
626
627
628
629
630
631
 
632
633
634
 
626
627
628
 
 
 
629
630
631
632
@@ -626,9 +626,7 @@
  # disable/enable menus as required   parents = [self.repo.changelog.rev(x.node()) for x in   self.repo.changectx(None).parents()] - can_merge = selrev not in parents and \ - len(self.repo.heads()) > 1 and \ - len(parents) < 2 + can_merge = selrev not in parents and len(parents) < 2   self._cmenu_merge.set_sensitive(can_merge)     # display the context menu