Patchwork [07,of,14] merge: .hgsubstate is special as merge destination, not as merge source

login
register
mail settings
Submitter Mads Kiilerich
Date Jan. 13, 2013, 7:02 p.m.
Message ID <aff4835b27c68e1525be.1358103762@localhost6.localdomain6>
Download mbox | patch
Permalink /patch/582/
State Superseded
Commit 26627c30735a610f59979a36885b327b25d8dbff
Headers show

Comments

Mads Kiilerich - Jan. 13, 2013, 7:02 p.m.
# HG changeset patch
# User Mads Kiilerich <mads@kiilerich.com>
# Date 1358102468 -3600
# Node ID aff4835b27c68e1525be62ab7d9453d52a501808
# Parent  518580772dfda62de0db08bff6aa88a5c089a374
merge: .hgsubstate is special as merge destination, not as merge source

Patch

diff --git a/mercurial/merge.py b/mercurial/merge.py
--- a/mercurial/merge.py
+++ b/mercurial/merge.py
@@ -342,7 +342,7 @@  def applyupdates(repo, actions, wctx, mc
         f, m = a[:2]
         if m == "m": # merge
             f2, fd, flags, move = a[2:]
-            if f == '.hgsubstate': # merged internally
+            if fd == '.hgsubstate': # merged internally
                 continue
             repo.ui.debug("preserving %s for resolve of %s\n" % (f, fd))
             fcl = wctx[f]
@@ -388,7 +388,7 @@  def applyupdates(repo, actions, wctx, mc
                              (f, inst.strerror))
             removed += 1
         elif m == "m": # merge
-            if f == '.hgsubstate': # subrepo states need updating
+            if fd == '.hgsubstate': # subrepo states need updating
                 subrepo.submerge(repo, wctx, mctx, wctx.ancestor(mctx),
                                  overwrite)
                 continue