Mercurial > public > mercurial-scm > hg-stable
diff tests/test-rebase-parameters.t @ 20249:dc5157841361
rebase: improve error message for --base being empty or causing emptiness
Before it just said 'nothing to rebase'.
Now 'if "base" is an empty set:
abort: empty "base" revision set - can't compute rebase set
If the set of changesets to rebase can't be found from "base", it will fail as
before but with more explanation of what the problem was.
The name of the "base" option is not obvious - it is more like "samples
identifying the branch to rebase". The error messages for problems with the
specified "base" value will use that term and might thus also not be obvious,
but at least they are consistent with the option name. The name "base" will not
be used if the base only was specified implicitly as the working directory
parent.
| author | Mads Kiilerich <madski@unity3d.com> |
|---|---|
| date | Sun, 17 Nov 2013 18:21:58 -0500 |
| parents | 3bff26f67169 |
| children | cb4223c65f79 |
line wrap: on
line diff
--- a/tests/test-rebase-parameters.t Sun Nov 17 18:21:58 2013 -0500 +++ b/tests/test-rebase-parameters.t Sun Nov 17 18:21:58 2013 -0500 @@ -87,14 +87,26 @@ abort: empty "source" revision set - nothing to rebase [255] + $ hg rebase --base '1 & !1' + abort: empty "base" revision set - can't compute rebase set + [255] + $ hg rebase - nothing to rebase + nothing to rebase - working directory parent is also destination + [1] + + $ hg rebase -b. + nothing to rebase - e7ec4e813ba6 is both "base" and destination [1] $ hg up -q 7 $ hg rebase --traceback - nothing to rebase + nothing to rebase - working directory parent is already an ancestor of destination e7ec4e813ba6 + [1] + + $ hg rebase -b. + nothing to rebase - "base" 02de42196ebe is already an ancestor of destination e7ec4e813ba6 [1] $ hg rebase --dest '1 & !1' @@ -137,7 +149,6 @@ $ cd .. - Rebase with base == '.' => same as no arguments (from 3 onto 8): $ hg clone -q -u 3 a a2