Show More
@@ -954,6 +954,8 b' def dounshelve(ui, repo, *shelved, **opt' | |||||
954 | state = _loadshelvedstate(ui, repo, opts) |
|
954 | state = _loadshelvedstate(ui, repo, opts) | |
955 | if abortf: |
|
955 | if abortf: | |
956 | return unshelveabort(ui, repo, state) |
|
956 | return unshelveabort(ui, repo, state) | |
|
957 | elif continuef and interactive: | |||
|
958 | raise error.Abort(_('cannot use both continue and interactive')) | |||
957 | elif continuef: |
|
959 | elif continuef: | |
958 | return unshelvecontinue(ui, repo, state, opts) |
|
960 | return unshelvecontinue(ui, repo, state, opts) | |
959 | elif len(shelved) > 1: |
|
961 | elif len(shelved) > 1: |
@@ -1347,6 +1347,12 b' Abort unshelve while merging (issue5123)' | |||||
1347 | $ hg resolve -m bar1 bar2 |
|
1347 | $ hg resolve -m bar1 bar2 | |
1348 | (no more unresolved files) |
|
1348 | (no more unresolved files) | |
1349 | continue: hg unshelve --continue |
|
1349 | continue: hg unshelve --continue | |
|
1350 | ||||
|
1351 | -- using --continue with --interactive should throw an error | |||
|
1352 | $ hg unshelve --continue -i | |||
|
1353 | abort: cannot use both continue and interactive | |||
|
1354 | [255] | |||
|
1355 | ||||
1350 | $ cat bar1 |
|
1356 | $ cat bar1 | |
1351 | A |
|
1357 | A | |
1352 | B |
|
1358 | B |
General Comments 0
You need to be logged in to leave comments.
Login now