[PATCH 07 of 14] merge: .hgsubstate is special as merge destination, not as merge source
Mads Kiilerich
mads at kiilerich.com
Sun Jan 13 13:02:42 CST 2013
# HG changeset patch
# User Mads Kiilerich <mads at kiilerich.com>
# Date 1358102468 -3600
# Node ID aff4835b27c68e1525be62ab7d9453d52a501808
# Parent 518580772dfda62de0db08bff6aa88a5c089a374
merge: .hgsubstate is special as merge destination, not as merge source
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
More information about the Mercurial-devel
mailing list