Mercurial > public > mercurial-scm > hg
diff relnotes/next @ 44556:f63598aa1c4b
rebase: accept multiple --base arguments (BC)
Same reasoning as for the previous patch. Rebase has worked well with
`--base 'A + B'` since 51e7c83e05ee (rebase: calculate ancestors for
--base separately (issue5420), 2016-11-28).
Differential Revision: https://phab.mercurial-scm.org/D8293
| author | Martin von Zweigbergk <martinvonz@google.com> |
|---|---|
| date | Fri, 13 Mar 2020 16:57:38 -0700 |
| parents | 05654ea5137c |
| children | f445a4f7e8a7 |
line wrap: on
line diff
--- a/relnotes/next Fri Mar 13 16:39:32 2020 -0700 +++ b/relnotes/next Fri Mar 13 16:57:38 2020 -0700 @@ -58,12 +58,12 @@ can use the new `conflictparents()` revset for finding the other parent during a conflict. - * `hg rebase` now accepts repeated `--source` arguments. For example, - `hg rebase --source 'A + B'` is equivalent to `hg rebase --source A - --source B`. This is a backwards-incompatible change because it - will break overriding an alias `myrebase = rebase --source A` by - `hg myrebase --source B` (it will now rebase `(A + B)::` instead of - `B::`). + * `hg rebase` now accepts repeated `--source` and `--base` + arguments. For example, `hg rebase --source 'A + B'` is equivalent + to `hg rebase --source A --source B`. This is a + backwards-incompatible change because it will break overriding an + alias `myrebase = rebase --source A` by `hg myrebase --source B` + (it will now rebase `(A + B)::` instead of `B::`). * `hg recover` does not verify the validity of the whole repository anymore. You can pass `--verify` or call `hg verify` if necessary.