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
#!/bin/sh
hg init
echo 123 > a
echo 123 > c
hg add a c
hg commit -m "first" -d "0 0" a c
echo 123 > b
echo %% should show b unknown
hg status
echo 12 > c
echo %% should show b unknown and c modified
hg status
hg add b
echo %% should show b added and c modified
hg status
hg rm a
echo %% should show a removed, b added and c modified
hg status
hg revert a
echo %% should show b added and c modified
hg status
hg revert b
echo %% should show b unknown and c modified
hg status
hg revert c
echo %% should show b unknown
hg status
echo %% should show a b and c
ls
true