Show More
@@ -221,8 +221,6 b' def update(repo, node):' | |||||
221 | """update the working directory to node, merging linear changes""" |
|
221 | """update the working directory to node, merging linear changes""" | |
222 | stats = _merge.update(repo, node, False, False, None, None) |
|
222 | stats = _merge.update(repo, node, False, False, None, None) | |
223 | _showstats(repo, stats) |
|
223 | _showstats(repo, stats) | |
224 | branch = repo.changectx(node).branch() |
|
|||
225 | repo.opener("branch", "w").write(branch + "\n") |
|
|||
226 | if stats[3]: |
|
224 | if stats[3]: | |
227 | repo.ui.status(_("There are unresolved merges with" |
|
225 | repo.ui.status(_("There are unresolved merges with" | |
228 | " locally modified files.\n")) |
|
226 | " locally modified files.\n")) | |
@@ -231,8 +229,6 b' def update(repo, node):' | |||||
231 | def clean(repo, node, wlock=None, show_stats=True): |
|
229 | def clean(repo, node, wlock=None, show_stats=True): | |
232 | """forcibly switch the working directory to node, clobbering changes""" |
|
230 | """forcibly switch the working directory to node, clobbering changes""" | |
233 | stats = _merge.update(repo, node, False, True, None, wlock) |
|
231 | stats = _merge.update(repo, node, False, True, None, wlock) | |
234 | branch = repo.changectx(node).branch() |
|
|||
235 | repo.opener("branch", "w").write(branch + "\n") |
|
|||
236 | if show_stats: _showstats(repo, stats) |
|
232 | if show_stats: _showstats(repo, stats) | |
237 | return stats[3] |
|
233 | return stats[3] | |
238 |
|
234 |
@@ -411,6 +411,9 b' def update(repo, node, branchmerge, forc' | |||||
411 | recordupdates(repo, action, branchmerge) |
|
411 | recordupdates(repo, action, branchmerge) | |
412 | repo.dirstate.setparents(fp1, fp2) |
|
412 | repo.dirstate.setparents(fp1, fp2) | |
413 | repo.hook('update', parent1=xp1, parent2=xp2, error=stats[3]) |
|
413 | repo.hook('update', parent1=xp1, parent2=xp2, error=stats[3]) | |
|
414 | if not branchmerge: | |||
|
415 | print "yow!" | |||
|
416 | repo.opener("branch", "w").write(p1.branch() + "\n") | |||
414 |
|
417 | |||
415 | return stats |
|
418 | return stats | |
416 |
|
419 |
General Comments 0
You need to be logged in to leave comments.
Login now