Reverse the way backout is doing the merge Currently, backout is creating a backout revision as a child node of the backed out node and will leave you at this new head. This has several drawbacks: * this changes the current head * when there is a long history between the backed out node and the current head, this will generate a huge number of diffs that are scary at first sight, and not very natural to review before commit. The change consists to switch back to the original node as soon as the backout node (which becomes the new tip) has been created. Then the --merge option can just merge this new tip in the current node. * the current head/node is not changed from the user's point of view * even without using the --merge option, the backout revision is still easy to locate, as this is the tip * the merge is much more intuitive as diffs of the merge is right you are looking to backout

     1

#!/bin/sh

     2

     3

echo '[extensions]' >> $HGRCPATH

     4

echo 'hgext.mq =' >> $HGRCPATH

     5

     6

hg init repo

     7

cd repo

     8

     9

echo foo > foo

    10

hg ci -qAm 'add a file'

    11

    12

hg qinit

    13

    14

hg qnew foo

    15

echo foo >> foo

    16

hg qrefresh -m 'append foo'

    17

    18

hg qnew bar

    19

echo bar >> foo

    20

hg qrefresh -m 'append bar'

    21

    22

echo '% try to commit on top of a patch'

    23

echo quux >> foo

    24

hg ci -m 'append quux'

    25

    26

# cheat a bit...

    27

mv .hg/patches .hg/patches2

    28

hg ci -m 'append quux'

    29

mv .hg/patches2 .hg/patches

    30

    31

echo '% qpop/qrefresh on the wrong revision'

    32

hg qpop

    33

hg qpop -n patches 2>&1 | sed -e 's/\(using patch queue:\).*/\1/'

    34

hg qrefresh

    35

    36

hg up -C qtip

    37

echo '% qpop'

    38

hg qpop

    39

    40

echo '% qrefresh'

    41

hg qrefresh

    42

    43

echo '% tip:'

    44

hg tip --template '#rev# #desc#\n'