Mercurial > hg-stable
comparison tests/test-rebase-parameters.t @ 21197:cb4223c65f79 stable
rebase: don't abort if we're asked to rebase an empty revset
The documentation says we exit 1 if we have nothing to do, so avoid
breaking that contract when we're passed an empty revset.
This was changed in http://www.selenic.com/hg/rev/a259f7b488ab to
improve the error message; keep the improved message, just not the
abort.
author | Julien Cristau <julien.cristau@logilab.fr> |
---|---|
date | Wed, 23 Apr 2014 13:51:35 +0200 |
parents | dc5157841361 |
children | 799c494189a9 |
comparison
equal
deleted
inserted
replaced
21196:5c0d5b95b824 | 21197:cb4223c65f79 |
---|---|
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' | 82 $ hg rebase --rev '1 & !1' |
83 abort: empty "rev" revision set - nothing to rebase | 83 empty "rev" revision set - nothing to rebase |
84 [255] | 84 [1] |
85 | 85 |
86 $ hg rebase --source '1 & !1' | 86 $ hg rebase --source '1 & !1' |
87 abort: empty "source" revision set - nothing to rebase | 87 abort: empty "source" revision set - nothing to rebase |
88 [255] | 88 [255] |
89 | 89 |