Mercurial Mercurial > mercurial / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge: fix branch setting
authorMatt Mackall <mpm@selenic.com>
Tue, 17 Oct 2006 22:59:01 -0500
changeset 3442 798bcde0c9c2
parent 3441 ef2e990f9047
child 3443 e6045fc3cd50
merge: fix branch setting (and remove debugging message)
mercurial/merge.py file | annotate | diff | comparison | revisions 
--- a/mercurial/merge.py	Tue Oct 17 22:34:43 2006 -0500
+++ b/mercurial/merge.py	Tue Oct 17 22:59:01 2006 -0500
@@ -412,8 +412,7 @@
         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")
+            repo.opener("branch", "w").write(p2.branch() + "\n")
 
     return stats
mercurial