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

Update branch on checkout/update

Browse Source
This commit is contained in:
Matt Mackall 2006-10-17 18:30:20 -05:00
parent 2b5eed953c
commit 7a65ba3d4f
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
mercurial/hg.py
View File

@ -221,6 +221,8 @@ def update(repo, node):
"""update the working directory to node, merging linear changes""" """update the working directory to node, merging linear changes"""
stats = _merge.update(repo, node, False, False, None, None) stats = _merge.update(repo, node, False, False, None, None)
_showstats(repo, stats) _showstats(repo, stats)
branch = repo.changectx(node).branch()
repo.opener("branch", "w").write(branch + "\n")
if stats[3]: if stats[3]:
repo.ui.status(_("There are unresolved merges with" repo.ui.status(_("There are unresolved merges with"
" locally modified files.\n")) " locally modified files.\n"))
@ -229,6 +231,8 @@ def update(repo, node):
def clean(repo, node, wlock=None, show_stats=True): def clean(repo, node, wlock=None, show_stats=True):
"""forcibly switch the working directory to node, clobbering changes""" """forcibly switch the working directory to node, clobbering changes"""
stats = _merge.update(repo, node, False, True, None, wlock) 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) if show_stats: _showstats(repo, stats)
return stats[3] return stats[3]