Mercurial > hg

diff mercurial/merge.py @ 4179:7e1c8a565a4f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Move branch read/write to dirstate where it belongs
author Matt Mackall <mpm@selenic.com>
date Tue, 13 Mar 2007 18:50:02 -0500
parents c95060a5391a
children dbc3846c09a1 4787e2b0dd03
line wrap: on
line diff
--- a/mercurial/merge.py	Tue Mar 13 15:47:55 2007 -0500
+++ b/mercurial/merge.py	Tue Mar 13 18:50:02 2007 -0500
@@ -488,9 +488,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