stabilize: improve unstable selection heuristic Without argument, stabilize was picking the first in: "unstable() and ((suspended() or obsancestors(::.))::)" which usually returned the "oldest" unstable revision in parent predecessors descendants. This revision is interesting because it usually gives "soft" merges but rebasing it left the working directory on a remote branch, which was very confusing. The new heuristic picks an unstable changeset which can be rebased on top of the parent revision, or on top of one of its descendants (selected in revision order). This has the advantage of selecting a revision which can be rebased on the current subtree, and leave the working directory in a more convenient location.

     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