A bunch of parsing/help updates -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 A bunch of parsing/help updates more explanation of how to get non-basic commands shorten names of debug functions and add docstrings add undo long docstring promote anotate, export, and revert make the global opts array global refactor parsing kill two unused arguments to fancyopts update test-help manifest hash: 459ae2273aaf54f71b4576677a681dc53ab2908c -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCyEDhywK+sNU5EO8RAr0DAJ9LTu8Fc2quLRtuwLPTQzWqlOJWKwCbBpZk pnMkYnshsutVYljcil1P46I= =Sleg -----END PGP SIGNATURE-----

     1

#!/bin/sh

     2

     3

export HGMERGE=true

     4

     5

set -ex

     6

mkdir r1

     7

cd r1

     8

hg init

     9

echo a > a

    10

hg addremove

    11

hg commit -t "1" -u test -d "0 0"

    12

    13

hg clone . ../r2

    14

cd ../r2

    15

hg up

    16

echo abc > a

    17

hg diff > ../d

    18

sed "s/\(\(---\|+++\).*\)\t.*/\1/" < ../d

    19

    20

cd ../r1

    21

echo b > b

    22

echo a2 > a

    23

hg addremove

    24

hg commit -t "2" -u test -d "0 0"

    25

    26

cd ../r2

    27

hg -q pull ../r1

    28

hg status

    29

hg --debug up

    30

hg --debug up -m

    31

hg parents

    32

hg -v history

    33

hg diff > ../d

    34

sed "s/\(\(---\|+++\).*\)\t.*/\1/" < ../d

    35