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

imported patch foo

Browse Source
This commit is contained in:
Matt Mackall 2006-10-17 22:34:43 -05:00
parent 12537f44dc
commit 8c602e592a
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
mercurial/hg.py
View File

@ -221,8 +221,6 @@ def update(repo, node):
"""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"))
@ -231,8 +229,6 @@ def update(repo, node):
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]

3
mercurial/merge.py
View File

@ -411,6 +411,9 @@ def update(repo, node, branchmerge, force, partial, wlock):
recordupdates(repo, action, branchmerge)
repo.dirstate.setparents(fp1, fp2)
repo.hook('update', parent1=xp1, parent2=xp2, error=stats[3])
if not branchmerge:
print "yow!"
repo.opener("branch", "w").write(p1.branch() + "\n")
return stats