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 -e

     4

     5

mkdir test

     6

cd test

     7

echo foo>foo

     8

hg init

     9

hg addremove

    10

hg commit -t "1"

    11

hg verify

    12

hg serve -p 20059 2>/dev/null &

    13

C=$!

    14

cd ..

    15

    16

mkdir copy

    17

cd copy

    18

hg init http://localhost:20059/

    19

hg verify

    20

hg co

    21

cat foo

    22

hg manifest

    23

    24

kill $C