comparison 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

44554:c4c97cabfc16

 * When `hg rebase` pauses for merge conflict resolution, the working
   copy will no longer have the rebased node as a second parent. You
   can use the new `conflictparents()` revset for finding the other
   parent during a conflict.

 * `hg recover` does not verify the validity of the whole repository
   anymore. You can pass `--verify` or call `hg verify` if necessary.

 * `hg debugmergestate` output format changed. Let us know if that is
   causing you problems and we'll roll it back.

44555:05654ea5137c

 * When `hg rebase` pauses for merge conflict resolution, the working
   copy will no longer have the rebased node as a second parent. You
   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.

 * `hg debugmergestate` output format changed. Let us know if that is
   causing you problems and we'll roll it back.