diff relnotes/next @ 44555:05654ea5137c

rebase: accept multiple --source arguments (BC) I think it's a little surprising that `hg rebase -s A -s B` rebases only `B::` and ignores `A`. That's because the `-s` flag is not a repeated flag. This patch makes it a repeated flag. Differential Revision: https://phab.mercurial-scm.org/D8292
author Martin von Zweigbergk <martinvonz@google.com>
date Fri, 13 Mar 2020 16:39:32 -0700
parents bd7b2c8d06cc
children f63598aa1c4b
line wrap: on
line diff
--- a/relnotes/next	Fri Mar 13 19:29:02 2020 -0700
+++ b/relnotes/next	Fri Mar 13 16:39:32 2020 -0700
@@ -58,6 +58,13 @@
    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 recover` does not verify the validity of the whole repository
    anymore. You can pass `--verify` or call `hg verify` if necessary.