Mercurial > hg > mercurial-crew-with-dirclash

comparison mercurial/merge.py @ 4207:7e1c8a565a4f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Move branch read/write to dirstate where it belongs
author Matt Mackall <mpm@selenic.com>
date Tue, 13 Mar 2007 18:50:02 -0500
parents c95060a5391a
children dbc3846c09a1 4787e2b0dd03
comparison
equal deleted inserted replaced
4206:0b48e3985765 4207:7e1c8a565a4f
486 stats = applyupdates(repo, action, wc, p2) 486 stats = applyupdates(repo, action, wc, p2)
487 487
488 if not partial: 488 if not partial:
489 recordupdates(repo, action, branchmerge) 489 recordupdates(repo, action, branchmerge)
490 repo.dirstate.setparents(fp1, fp2) 490 repo.dirstate.setparents(fp1, fp2)
491 if not branchmerge:
492 repo.dirstate.setbranch(p2.branch())
491 repo.hook('update', parent1=xp1, parent2=xp2, error=stats[3]) 493 repo.hook('update', parent1=xp1, parent2=xp2, error=stats[3])
492 if not branchmerge:
493 repo.opener("branch", "w").write(p2.branch() + "\n")
494 494
495 return stats 495 return stats
496 496