Mercurial > public > mercurial-scm > hg-stable

diff 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
line wrap: on
line diff
--- a/mercurial/merge.py	Tue Oct 17 22:26:14 2006 -0500
+++ b/mercurial/merge.py	Tue Oct 17 22:34:43 2006 -0500
@@ -411,6 +411,9 @@
         recordupdates(repo, action, branchmerge)
         repo.dirstate.setparents(fp1, fp2)
         repo.hook('update', parent1=xp1, parent2=xp2, error=stats[3])
+        if not branchmerge:
+            print "yow!"
+            repo.opener("branch", "w").write(p1.branch() + "\n")
 
     return stats