merge: back out changeset a4ca0610c754 (parents order when grafting a merge) Turns out it's not enough to just swap parents, because when we do, there are unexpected bad side effects, such as a tracked file becoming untracked. These side effects need more code to be handled properly, but it's not written yet. Let's back this feature out from stable for now and some day implement it on default instead.

     1

Issue351: mq: qrefresh can create extra revlog entry

     2

     3

  $ echo "[extensions]" >> $HGRCPATH

     4

  $ echo "mq=" >> $HGRCPATH

     5

     6

  $ hg init

     7

  $ hg qinit

     8

     9

  $ echo b > b

    10

  $ hg ci -A -m foo

    11

  adding b

    12

    13

  $ echo cc > b

    14

  $ hg qnew -f foo.diff

    15

  $ echo b > b

    16

  $ hg qrefresh

    17

    18

  $ hg debugindex b

    19

     rev linkrev nodeid       p1           p2

    20

       0       0 1e88685f5dde 000000000000 000000000000

    21