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

     4

mkfifo p

     5

     6

hg serve --stdio < p &

     7

P=$!

     8

(echo lock; echo addchangegroup; sleep 5) > p &

     9

Q=$!

    10

sleep 1

    11

kill -HUP $P

    12

sleep 1

    13

ls .hg

    14

    15

    16