Show More
@@ -461,16 +461,23 b' def backout(ui, repo, node=None, rev=Non' | |||
|
461 | 461 | try: |
|
462 | 462 | branch = repo.dirstate.branch() |
|
463 | 463 | bheads = repo.branchheads(branch) |
|
464 | hg.clean(repo, node, show_stats=False) | |
|
465 | repo.dirstate.setbranch(branch) | |
|
466 | 464 | rctx = scmutil.revsingle(repo, hex(parent)) |
|
467 | cmdutil.revert(ui, repo, rctx, repo.dirstate.parents()) | |
|
468 | 465 | if not opts.get('merge') and op1 != node: |
|
469 | 466 | try: |
|
470 | 467 | ui.setconfig('ui', 'forcemerge', opts.get('tool', '')) |
|
471 | return hg.update(repo, op1) | |
|
468 | stats = mergemod.update(repo, parent, True, True, False, node, False) | |
|
469 | repo.setparents(op1, op2) | |
|
470 | hg._showstats(repo, stats) | |
|
471 | if stats[3]: | |
|
472 | repo.ui.status(_("use 'hg resolve' to retry unresolved file merges\n")) | |
|
473 | return stats[3] > 0 | |
|
472 | 474 | finally: |
|
473 | 475 | ui.setconfig('ui', 'forcemerge', '') |
|
476 | else: | |
|
477 | hg.clean(repo, node, show_stats=False) | |
|
478 | repo.dirstate.setbranch(branch) | |
|
479 | cmdutil.revert(ui, repo, rctx, repo.dirstate.parents()) | |
|
480 | ||
|
474 | 481 | |
|
475 | 482 | e = cmdutil.commiteditor |
|
476 | 483 | if not opts['message'] and not opts['logfile']: |
@@ -188,7 +188,6 b' backout should not back out subsequent c' | |||
|
188 | 188 | |
|
189 | 189 | without --merge |
|
190 | 190 | $ hg backout -d '3 0' 1 --tool=true |
|
191 | reverting a | |
|
192 | 191 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
193 | 192 | $ hg locate b |
|
194 | 193 | b |
@@ -324,8 +323,7 b' named branches' | |||
|
324 | 323 | |
|
325 | 324 | without --merge |
|
326 | 325 | $ hg backout -r 1 --tool=true |
|
327 | removing file1 | |
|
328 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
|
326 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved | |
|
329 | 327 | $ hg branch |
|
330 | 328 | branch2 |
|
331 | 329 | $ hg status -A |
@@ -468,11 +468,6 b' backout calls revert internally with min' | |||
|
468 | 468 | KeyError |
|
469 | 469 | |
|
470 | 470 | $ hg backout ".^" |
|
471 | reverting .hgsubstate | |
|
472 | reverting subrepo s | |
|
473 | reverting s/a (glob) | |
|
474 | reverting subrepo ss | |
|
475 | reverting subrepo t | |
|
476 | 471 | 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
477 | 472 | |
|
478 | 473 | $ hg up -C # discard changes |
General Comments 0
You need to be logged in to leave comments.
Login now