obsolete: handle rebase --collapse Recording obsolete in concludenode() did not work for --collapse because only the first revision was passed to the call. The new strategy is to track the rebase state in defineparents() and concludenode() and to create markers only after a successful non-abort call. In theory, this should also fix --continue/--abort cases. The change in test-stabilize-order.t comes from concludenode() no longer creating obsolete marker. stabilize command was actually duplicating markers, once in concludenode(), once explicitely.

     1

#!/bin/sh

     2

     3

here=`readlink -f "$0"`

     4

repo_root=`dirname "$here"`

     5

     6

     7

     8

cat << EOF >&2

     9

XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX

    10

XXX Add lines below to the [extensions] section of you hgrc XXX

    11

XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX

    12

    13

    14

EOF

    15

    16

cat << EOF | sed -e "s#XXXREPOPATHXXX#${repo_root}#"

    17

[extensions]

    18

# experimental extensions for mq export

    19

qsync=XXXREPOPATHXXX/hgext/qsync.py

    20

EOF