view tests/test-simple-update @ 1701:4ba8fe499df2

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

set -e

mkdir test
cd test
echo foo>foo
hg init
hg addremove
hg commit -m "1"
hg verify

hg clone . ../branch
cd ../branch
hg co
echo bar>>foo
hg commit -m "2"

cd ../test
hg pull ../branch
hg verify
hg co
cat foo
hg manifest