Mercurial > hg
diff tests/test-rebase-dest.t @ 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 | dc5e5577af39 |
line wrap: on
line diff
--- a/tests/test-rebase-dest.t Fri Mar 13 16:39:32 2020 -0700 +++ b/tests/test-rebase-dest.t Fri Mar 13 16:57:38 2020 -0700 @@ -156,7 +156,7 @@ Multiple destinations cannot be used with --base: - $ rebasewithdag -b B+E -d 'SRC^^' --collapse <<'EOS' + $ rebasewithdag -b B -b E -d 'SRC^^' --collapse <<'EOS' > B E > | | > A D