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

merge: only advance to 'commit' stage when merge adds a parent

if merge did not succeed, there will be nothing to commit or resolve.

Changeset efdf85a2fc2e…

Parent ace26d8a71c5…

by Steve Borho

Changes to one file · Browse files at efdf85a2fc2e Showing diff from parent ace26d8a71c5 Diff from another changeset...

Change 1 of 2 Show Entire File hggtk/​merge.py Stacked
 
94
95
96
 
97
98
99
 
123
124
125
 
 
 
126
127
128
 
94
95
96
97
98
99
100
 
124
125
126
127
128
129
130
131
132
@@ -94,6 +94,7 @@
  undo.connect('clicked', self.undo, local, merge, commit)   merge.connect('clicked', self.merge, other, commit, undo)   commit.connect('clicked', self.commit) + self.repo = repo     def revdesc(self, repo, revid):   ctx = repo[revid] @@ -123,6 +124,9 @@
  dlg = hgcmd.CmdDialog(cmdline)   dlg.run()   dlg.hide() + self.repo.invalidate() + if len(self.repo.parents()) == 1: + return   if self.notify_func:   self.notify_func(self.notify_args)   button.set_sensitive(False)