Mercurial > hg > mercurial-crew-with-dirclash

comparison mercurial/merge.py @ 3441:ef2e990f9047

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
imported patch foo
author Matt Mackall <mpm@selenic.com>
date Tue, 17 Oct 2006 22:34:43 -0500
parents d2b55e3c4e25
children 798bcde0c9c2
comparison
equal deleted inserted replaced
3440:0f1fd9854cdc 3441:ef2e990f9047
409 409
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:
415 print "yow!"
416 repo.opener("branch", "w").write(p1.branch() + "\n")
414 417
415 return stats 418 return stats
416 419