Mercurial > public > mercurial-scm > hg

diff mercurial/merge.py @ 4209:dbc3846c09a1

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge with -stable, fix small test failure
author Matt Mackall <mpm@selenic.com>
date Wed, 14 Mar 2007 01:26:09 -0500
parents ba51a8225a60 7e1c8a565a4f
children 0d51eb296fb9
line wrap: on
line diff
--- a/mercurial/merge.py	Tue Mar 13 21:54:34 2007 -0700
+++ b/mercurial/merge.py	Wed Mar 14 01:26:09 2007 -0500
@@ -493,9 +493,9 @@
     if not partial:
         recordupdates(repo, action, branchmerge)
         repo.dirstate.setparents(fp1, fp2)
+        if not branchmerge:
+            repo.dirstate.setbranch(p2.branch())
         repo.hook('update', parent1=xp1, parent2=xp2, error=stats[3])
-        if not branchmerge:
-            repo.opener("branch", "w").write(p2.branch() + "\n")
 
     return stats