hgmerge: various cleanups Details: - put temporary file names into variables - make all temporary file names end with random part - cleanup FileMerge handling - do not use hardlinks in FileMerge change test (breaks on FAT) - try harder to keep file mtime unchanged in case of failed merge

     1

#!/bin/sh

     2

     3

hg init a

     4

cd a

     5

echo a > foo

     6

hg add foo

     7

hg commit -m 1 -d "0 0"

     8

rm foo

     9

hg remove foo

    10

hg commit -m 2 -d "0 0"

    11

hg export 0

    12

hg export 1

    13

hg log -p -r 0

    14

hg log -p -r 1

    15

    16

cd ..

    17

hg clone a b