rebase: don't use rebased node as dirstate p2 (BC) When rebasing a node, we currently use the rebased node as p2 in the dirstate until just before we commit it (we then change to the desired parents). This p2 is visible to the user when the rebase gets interrupted because of merge conflicts. That can be useful to the user as a reminder of which commit is currently being rebased, but I believe it's incorrect for a few reasons: * I think the dirstate parents should be the ones that will be set when the commit is created. * I think having two parents means that you're merging those two commits, but when rebasing, you're generally grafting, not merging. * When rebasing a merge commit, we should use the two desired parents as dirstate parents (and we clearly can't have the rebased node as a third dirstate parent). * `hg graft` (and `hg update --merge`) sets only one parent and `hg rebase` should be consistent with that. I realize that this is a somewhat large user-visible change, but I think it's worth it because it will simplify things quite a bit. Differential Revision: https://phab.mercurial-scm.org/D7827

     1

== New Features ==

     2

     3

 * `hg purge`/`hg clean` can now delete ignored files instead of

     4

   untracked files, with the new -i flag.

     5

     6

 * `hg log` now defaults to using an '%' symbol for commits involved

     7

    in unresolved merge conflicts. That includes unresolved conflicts

     8

    caused by e.g. `hg update --merge` and `hg graft`. '@' still takes

     9

    precedence, so what used to be marked '@' still is.

    10

    11

 * New `conflictlocal()` and `conflictother()` revsets return the

    12

   commits that are being merged, when there are conflicts. Also works

    13

   for conflicts caused by e.g. `hg graft`.

    14

    15

    16

== New Experimental Features ==

    17

    18

    19

== Bug Fixes  ==

    20

    21

    22

== Backwards Compatibility Changes ==

    23

    24

 * When `hg rebase` pauses for merge conflict resolution, the working

    25

   copy will no longer have the rebased node as a second parent. You

    26

   can use the new `conflictparents()` revset for finding the other

    27

   parent during a conflict.

    28

    29

    30

== Internal API Changes ==

    31

    32

 * The deprecated `ui.progress()` has now been deleted. Please use

    33

   `ui.makeprogress()` instead.

    34

    35

 * `hg.merge()` has lost its `abort` argument. Please call

    36

   `hg.abortmerge()` directly instead.

    37

    38

 * The `*others` argument of `cmdutil.check_incompatible_arguments()`

    39

   changed from being varargs argument to being a single collection.