options: kill -d for debug -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 options: kill -d for debug You must now use --debug. This is a preparatory step for changing the option parsing from: hg [global-opts] <command> [command-opts] to hg [global-opts] <command> [global or command opts] manifest hash: ec5ecc687340baa109a98b742f1cd8d1f4aadeed -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCx4urywK+sNU5EO8RAl90AJ0fwKU/GwHpJvlTFl5naeJbkceWewCgh4jK kaTSSodACgPzgbFiid5RL4Y= =siEe -----END PGP SIGNATURE-----

     1

#!/bin/sh -x

     2

hg --debug init

     3

echo this is a1 > a

     4

hg add a

     5

hg commit -t0 -d "0 0" -u user

     6

echo this is b1 > b

     7

hg add b

     8

hg commit -t1 -d "0 0" -u user

     9

hg manifest 1

    10

echo this is c1 > c

    11

hg rawcommit -p 1 -d "0 0" -u user -t2 c

    12

hg manifest 2

    13

hg parents

    14

rm b

    15

hg rawcommit -p 2 -d "0 0" -u user -t3 b

    16

hg manifest 3

    17

hg parents

    18

echo this is a22 > a

    19

hg rawcommit -p 3 -d "0 0" -u user -t4 a

    20

hg manifest 4

    21

hg parents

    22

echo this is c22 > c

    23

hg rawcommit -p 1 -d "0 0" -u user -t5 c

    24

hg manifest 5

    25

hg parents

    26

# merge, but no files changed

    27

hg rawcommit -p 4 -p 5 -d "0 0" -u user -t6

    28

hg manifest 6

    29

hg parents

    30

# no changes what-so-ever

    31

hg rawcommit -p 6 -d "0 0" -u user -t7

    32

hg manifest 7

    33

hg parents