Mercurial > hg-stable
changeset 4022:bf329bda51a6
Merge branchname changes in localrepo.commit.
| author | Thomas Arendsen Hein <thomas@intevation.de> |
|---|---|
| date | Thu, 11 Jan 2007 23:13:32 +0100 |
| parents | dfe87137ed14 (current diff) 1590558e9f60 (diff) |
| children | 6ea8a3b805ee |
| files | mercurial/localrepo.py |
| diffstat | 1 files changed, 5 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/mercurial/localrepo.py Fri Jan 05 00:01:53 2007 -0200 +++ b/mercurial/localrepo.py Thu Jan 11 23:13:32 2007 +0100 @@ -761,6 +761,8 @@ 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 @@ 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: