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

status: fix parent detection from wctx during merges

Changeset 91c87cc8e5cc…

Parent 8cbbfa2ad2cf…

by Steve Borho

Changes to one file · Browse files at 91c87cc8e5cc Showing diff from parent 8cbbfa2ad2cf Diff from another changeset...

Change 1 of 1 Show Entire File hggtk/​status.py Stacked
 
856
857
858
 
859
860
 
861
862
863
864
 
865
866
867
 
856
857
858
859
860
 
861
862
863
864
 
865
866
867
868
@@ -856,12 +856,13 @@
  difftext = [_('===== Diff to first parent =====\n')]   wfiles = [self.repo.wjoin(wfile)]   wctx = self.repo[None] + pctxs = wctx.parents()   matcher = cmdutil.match(self.repo, wfiles, self.opts) - for s in patch.diff(self.repo, wctx.p1().node(), None, + for s in patch.diff(self.repo, pctxs[0].node(), None,   match=matcher, opts=patch.diffopts(self.ui, self.opts)):   difftext.extend(s.splitlines(True))   difftext.append(_('\n===== Diff to second parent =====\n')) - for s in patch.diff(self.repo, wctx.p2().node(), None, + for s in patch.diff(self.repo, pctxs[1].node(), None,   match=matcher, opts=patch.diffopts(self.ui, self.opts)):   difftext.extend(s.splitlines(True))