Mercurial > hg

changeset 3416:145a8fde69e6

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Update branch on checkout/update
author Matt Mackall <mpm@selenic.com>
date Tue, 17 Oct 2006 18:30:20 -0500
parents 9a6491770b04
children 028fff46a4ac
files mercurial/hg.py
diffstat 1 files changed, 4 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/mercurial/hg.py	Tue Oct 17 18:30:19 2006 -0500
+++ b/mercurial/hg.py	Tue Oct 17 18:30:20 2006 -0500
@@ -221,6 +221,8 @@
     """update the working directory to node, merging linear changes"""
     stats = _merge.update(repo, node, False, False, None, None)
     _showstats(repo, stats)
+    branch = repo.changectx(node).branch()
+    repo.opener("branch", "w").write(branch + "\n")
     if stats[3]:
         repo.ui.status(_("There are unresolved merges with"
                          " locally modified files.\n"))
@@ -229,6 +231,8 @@
 def clean(repo, node, wlock=None, show_stats=True):
     """forcibly switch the working directory to node, clobbering changes"""
     stats = _merge.update(repo, node, False, True, None, wlock)
+    branch = repo.changectx(node).branch()
+    repo.opener("branch", "w").write(branch + "\n")
     if show_stats: _showstats(repo, stats)
     return stats[3]