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

merge: more robust merge status detection

Allocate a new repo object after attempting a merge. This will
give an accurate answer about the merge's success.

Changeset 672e90b71f9e…

Parent b8918626a43e…

by Steve Borho

Changes to one file · Browse files at 672e90b71f9e Showing diff from parent b8918626a43e Diff from another changeset...

Change 1 of 2 Show Entire File hggtk/​merge.py Stacked
 
94
95
96
97
98
99
100
 
124
125
126
127
128
 
 
129
130
131
 
94
95
96
 
97
98
99
 
123
124
125
 
 
126
127
128
129
130
@@ -94,7 +94,6 @@
  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] @@ -124,8 +123,8 @@
  dlg = hgcmd.CmdDialog(cmdline)   dlg.run()   dlg.hide() - self.repo.invalidate() - if len(self.repo.parents()) == 1: + repo = hg.repository(ui.ui(), path=paths.find_root()) + if len(repo.parents()) == 1:   return   if self.notify_func:   self.notify_func(self.notify_args)