--- a/mercurial/merge.py Sat Apr 17 13:38:42 2010 -0500
+++ b/mercurial/merge.py Tue Apr 20 11:17:01 2010 +0200
@@ -364,7 +364,7 @@
repo.dirstate.normallookup(f)
elif m == "g": # get
if branchmerge:
- repo.dirstate.normaldirty(f)
+ repo.dirstate.otherparent(f)
else:
repo.dirstate.normal(f)
elif m == "m": # merge
@@ -507,8 +507,8 @@
stats = applyupdates(repo, action, wc, p2)
if not partial:
+ repo.dirstate.setparents(fp1, fp2)
recordupdates(repo, action, branchmerge)
- repo.dirstate.setparents(fp1, fp2)
if not branchmerge and not fastforward:
repo.dirstate.setbranch(p2.branch())
finally: