Mercurial > public > mercurial-scm > hg-stable
diff mercurial/merge.py @ 10968:7a0d096e221e
dirstate: more explicit name, rename normaldirty() to otherparent()
| author | Benoit Boissinot <benoit.boissinot@ens-lyon.org> |
|---|---|
| date | Tue, 20 Apr 2010 11:17:01 +0200 |
| parents | 0e64d814d7d0 |
| children | 502474839293 |
line wrap: on
line diff
--- 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: