Mercurial > hg > mercurial-crew-with-dirclash

comparison mercurial/merge.py @ 3442:798bcde0c9c2

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge: fix branch setting (and remove debugging message)
author Matt Mackall <mpm@selenic.com>
date Tue, 17 Oct 2006 22:59:01 -0500
parents ef2e990f9047
children 3b4e00cba57a
comparison
equal deleted inserted replaced
3441:ef2e990f9047 3442:798bcde0c9c2
410 if not partial: 410 if not partial:
411 recordupdates(repo, action, branchmerge) 411 recordupdates(repo, action, branchmerge)
412 repo.dirstate.setparents(fp1, fp2) 412 repo.dirstate.setparents(fp1, fp2)
413 repo.hook('update', parent1=xp1, parent2=xp2, error=stats[3]) 413 repo.hook('update', parent1=xp1, parent2=xp2, error=stats[3])
414 if not branchmerge: 414 if not branchmerge:
415 print "yow!" 415 repo.opener("branch", "w").write(p2.branch() + "\n")
416 repo.opener("branch", "w").write(p1.branch() + "\n")
417 416
418 return stats 417 return stats
419 418