Mercurial > public > mercurial-scm > hg-stable

diff mercurial/merge.py @ 3773:b1eeaeb936ae

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Handle transcoding of branch names
author Matt Mackall <mpm@selenic.com>
date Sun, 03 Dec 2006 16:16:33 -0600
parents 9e67fecbfd16
children 6398ff7cb705
line wrap: on
line diff
--- a/mercurial/merge.py	Sun Dec 03 16:16:33 2006 -0600
+++ b/mercurial/merge.py	Sun Dec 03 16:16:33 2006 -0600
@@ -477,6 +477,7 @@
         repo.dirstate.setparents(fp1, fp2)
         repo.hook('update', parent1=xp1, parent2=xp2, error=stats[3])
         if not branchmerge:
+            b = util.tolocal(p2.branch())
             repo.opener("branch", "w").write(p2.branch() + "\n")
 
     return stats