equal
deleted
inserted
replaced
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 |