Mercurial > hg > mercurial-crew-with-dirclash

comparison mercurial/merge.py @ 3862:46abbed02b2d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Use UTF-8 in .hg/branch
author Alexis S. L. Carvalho <alexis@cecm.usp.br>
date Sun, 10 Dec 2006 20:35:28 -0200
parents 6398ff7cb705
children c0a12e6441a5
comparison
equal deleted inserted replaced
3861:db36a4f490f6 3862:46abbed02b2d
487 if not partial: 487 if not partial:
488 recordupdates(repo, action, branchmerge) 488 recordupdates(repo, action, branchmerge)
489 repo.dirstate.setparents(fp1, fp2) 489 repo.dirstate.setparents(fp1, fp2)
490 repo.hook('update', parent1=xp1, parent2=xp2, error=stats[3]) 490 repo.hook('update', parent1=xp1, parent2=xp2, error=stats[3])
491 if not branchmerge: 491 if not branchmerge:
492 b = util.tolocal(p2.branch())
493 repo.opener("branch", "w").write(p2.branch() + "\n") 492 repo.opener("branch", "w").write(p2.branch() + "\n")
494 493
495 return stats 494 return stats
496 495