Kiln » TortoiseHg » TortoiseHg
Clone URL:  
Pushed to one repository · View In Graph Contained in 2.1, 2.1.1, and 2.1.2

pbranch: add pmerge to context menu

Changeset 6bcdd63fb951…

Parent 87fbc0d06adf…

by Peer Sommerlund

Changes to one file · Browse files at 6bcdd63fb951 Showing diff from parent 87fbc0d06adf Diff from another changeset...

Change 1 of 2 Show Entire File tortoisehg/​hgqt/​pbranch.py Stacked
 
473
474
475
476
 
 
477
478
479
 
570
571
572
 
 
 
573
574
575
 
473
474
475
 
476
477
478
479
480
 
571
572
573
574
575
576
577
578
579
@@ -473,7 +473,8 @@
  # append(_('&New'), self.pnew_activated)   if not is_current:   append(_('&Goto (update workdir)'), self.goto_activated) - #if is_patch: + if is_patch: + append(_('&Merge'), self.merge_activated)   # append(_('&Edit message'), self.edit_message_activated)   # append(_('&Rename'), self.rename_activated)   # append(_('&Delete'), self.delete_activated) @@ -570,6 +571,9 @@
  dlg.finished.connect(dlg.deleteLater)   dlg.exec_()   + def merge_activated(self): + self.pmerge(self.selected_patch()) +   def delete_activated(self):   assert False