facebook/sapling
1
1
Fork 0
mirror of https://github.com/facebook/sapling.git synced 2024-10-09 08:18:15 +03:00
Code Issues Projects Releases Wiki Activity

Merge branchname changes in localrepo.commit.

Browse Source
This commit is contained in:
Thomas Arendsen Hein 2007-01-11 23:13:32 +01:00
commit 109316bf14
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
mercurial/localrepo.py
View File

@ -761,6 +761,8 @@ class localrepository(repo.repository):
edittext.append("HG: user: %s" % user)
if p2 != nullid:
edittext.append("HG: branch merge")
if branchname:
edittext.append("HG: branch %s" % util.tolocal(branchname))
edittext.extend(["HG: changed %s" % f for f in changed])
edittext.extend(["HG: removed %s" % f for f in removed])
if not changed and not remove:
@ -786,6 +788,9 @@ class localrepository(repo.repository):
parent2=xp2)
tr.close()
if self.branchcache and "branch" in extra:
self.branchcache[util.tolocal(extra["branch"])] = n
if use_dirstate or update_dirstate:
self.dirstate.setparents(n)
if use_dirstate: