Mercurial > hg-stable
comparison tests/test-rebase-parameters.t @ 20247:a259f7b488ab
rebase: improve error message for empty --rev set
Before, it just said 'nothing to rebase' in this case. Now, it aborts
mentioning the reason: 'empty "rev" revision set'.
Specifying revisions that cannot be rebased is a 'soft' error, but specifying
an empty set deserves an abort that explains exactly what the problem is.
| author | Mads Kiilerich <madski@unity3d.com> |
|---|---|
| date | Sat, 16 Nov 2013 15:46:29 -0500 |
| parents | e4dc4c89b03a |
| children | 3bff26f67169 |
comparison
equal
deleted
inserted
replaced
| 20246:e4dc4c89b03a | 20247:a259f7b488ab |
|---|---|
| 77 [255] | 77 [255] |
| 78 $ hg rebase --base 5 --rev 4 | 78 $ hg rebase --base 5 --rev 4 |
| 79 abort: cannot specify both a revision and a base | 79 abort: cannot specify both a revision and a base |
| 80 [255] | 80 [255] |
| 81 | 81 |
| 82 $ hg rebase --rev '1 & !1' | |
| 83 abort: empty "rev" revision set - nothing to rebase | |
| 84 [255] | |
| 85 | |
| 82 $ hg rebase | 86 $ hg rebase |
| 83 nothing to rebase | 87 nothing to rebase |
| 84 [1] | 88 [1] |
| 85 | 89 |
| 86 $ hg up -q 7 | 90 $ hg up -q 7 |