hg merge: fix time asymmetry bug with deleting files on update to past -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 hg merge: fix time asymmetry bug with deleting files on update to past manifest hash: 41feb7bf9b56e071a538a0918224898acb2bd31c -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCsm6XywK+sNU5EO8RAncbAKCwn/W4cr6civp4Zt79JFH6um0/lQCdFCh8 F7ZOQ+S/PL3HL4iE6avOBDc= =kHPm -----END PGP SIGNATURE-----

     1

#!/bin/bash

     2

     3

set -x

     4

hg init

     5

echo a > a

     6

hg add a

     7

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

     8

hg status

     9

cp a b

    10

hg copy a b

    11

hg status

    12

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

    13

hg history

    14

hg log a

    15

hexdump -C .hg/data/b.d

    16

hg cat b | md5sum

    17

hg cat a | md5sum

    18

hg verify