Mercurial > hg > mercurial-crew-with-dirclash
diff mercurial/merge.py @ 4177:ba51a8225a60
Merge with crew-stable
author | Brendan Cully <brendan@kublai.com> |
---|---|
date | Sat, 10 Mar 2007 17:45:32 -0800 |
parents | bb70d5fa02ae |
children | dbc3846c09a1 |
line wrap: on
line diff
--- a/mercurial/merge.py +++ b/mercurial/merge.py @@ -444,15 +444,15 @@ def update(repo, node, branchmerge, forc wlock = working dir lock, if already held """ - if node is None: - node = "tip" - if not wlock: wlock = repo.wlock() + wc = repo.workingctx() + if node is None: + # tip of current branch + node = repo.branchtags()[wc.branch()] overwrite = force and not branchmerge forcemerge = force and branchmerge - wc = repo.workingctx() pl = wc.parents() p1, p2 = pl[0], repo.changectx(node) pa = p1.ancestor(p2)