Mercurial > hg
comparison tests/test-shelve.t @ 42668:52a383451739
unshelve: add abort on using continue and interactive together
`unshelve --continue --interactive` will not work as expected by the
user as the mode of in-progress unshelve is preserved and cannot be
overwritten. This patch makes `unshelve` to throw an error on using
both `--continue` and `--interactive` together with `unshelve`.
Differential Revision: https://phab.mercurial-scm.org/D6703
author | Navaneeth Suresh <navaneeths1998@gmail.com> |
---|---|
date | Tue, 30 Jul 2019 21:36:15 +0530 |
parents | ee86ad6f50fe |
children | 4814d993fe21 |
comparison
equal
deleted
inserted
replaced
42667:6d50a7ebf7e0 | 42668:52a383451739 |
---|---|
1345 > C | 1345 > C |
1346 > EOF | 1346 > EOF |
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 |
1353 C | 1359 C |
1354 $ hg unshelve --continue <<EOF | 1360 $ hg unshelve --continue <<EOF |