Mercurial > hg > mercurial-crew-with-dirclash

comparison mercurial/merge.py @ 3202:9e002614f2eb

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge: minor nullid cleanup
author Matt Mackall <mpm@selenic.com>
date Fri, 29 Sep 2006 17:50:59 -0500
parents e67c22bc8bba
children 3fd098e0902d
comparison
equal deleted inserted replaced
3201:05c588e1803d 3202:9e002614f2eb
378 if not branchmerge: 378 if not branchmerge:
379 # we don't need to do any magic, just jump to the new rev 379 # we don't need to do any magic, just jump to the new rev
380 p1, p2 = p2, repo.changectx(nullid) 380 p1, p2 = p2, repo.changectx(nullid)
381 381
382 xp1, xp2 = str(p1), str(p2) 382 xp1, xp2 = str(p1), str(p2)
383 if p2.node() == nullid: xp2 = '' 383 if not p2: xp2 = ''
384 384
385 repo.hook('preupdate', throw=True, parent1=xp1, parent2=xp2) 385 repo.hook('preupdate', throw=True, parent1=xp1, parent2=xp2)
386 386
387 updated, merged, removed, unresolved = applyupdates(repo, action, xp1, xp2) 387 updated, merged, removed, unresolved = applyupdates(repo, action, xp1, xp2)
388 388