changeset 4179 | 7e1c8a565a4f |
parent 4115 | c95060a5391a |
child 4209 | dbc3846c09a1 |
child 4304 | 4787e2b0dd03 |
--- 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