Show More
@@ -218,7 +218,7 b' def rebase(ui, repo, **opts):' | |||||
218 | if srcf or basef or destf: |
|
218 | if srcf or basef or destf: | |
219 | raise util.Abort( |
|
219 | raise util.Abort( | |
220 | _('abort and continue do not allow specifying revisions')) |
|
220 | _('abort and continue do not allow specifying revisions')) | |
221 | if opts.get('tool', False): |
|
221 | if abortf and opts.get('tool', False): | |
222 | ui.warn(_('tool option will be ignored\n')) |
|
222 | ui.warn(_('tool option will be ignored\n')) | |
223 |
|
223 | |||
224 | try: |
|
224 | try: |
@@ -485,7 +485,6 b' Test --tool parameter:' | |||||
485 | $ hg resolve -m c2 |
|
485 | $ hg resolve -m c2 | |
486 | (no more unresolved files) |
|
486 | (no more unresolved files) | |
487 | $ hg rebase -c --tool internal:fail |
|
487 | $ hg rebase -c --tool internal:fail | |
488 | tool option will be ignored |
|
|||
489 | rebasing 2:e4e3f3546619 "c2b" (tip) |
|
488 | rebasing 2:e4e3f3546619 "c2b" (tip) | |
490 | note: rebase of 2:e4e3f3546619 created no changes to commit |
|
489 | note: rebase of 2:e4e3f3546619 created no changes to commit | |
491 | saved backup bundle to $TESTTMP/b3/.hg/strip-backup/e4e3f3546619-b0841178-backup.hg (glob) |
|
490 | saved backup bundle to $TESTTMP/b3/.hg/strip-backup/e4e3f3546619-b0841178-backup.hg (glob) |
General Comments 0
You need to be logged in to leave comments.
Login now