tests/test-merge9
author Adrian Buehlmann <adrian@cadifra.com>
Sat, 13 Dec 2008 17:39:56 +0100
changeset 7514 e54cf540c6ca
parent 6518 92ccccb55ba3
child 7527 5a14a8f3b909
permissions -rwxr-xr-x
store: don't create dirs ending in period or space for hashed paths (issue1417) Windows won't create directories with names ending in period or space, so we replace the last period/space character in truncated directory names of hashed paths with some other character (underbar).

#!/bin/sh

# test that we don't interrupt the merge session if
# a file-level merge failed

hg init repo
cd repo

echo foo > foo
echo a > bar
hg ci -Am 'add foo' -d '0 0'

hg mv foo baz
echo b >> bar
echo quux > quux1
hg ci -Am 'mv foo baz' -d '0 0'

hg up -qC 0
echo >> foo
echo c >> bar
echo quux > quux2
hg ci -Am 'change foo' -d '0 0'

# test with the rename on the remote side
HGMERGE=false hg merge
hg resolve -l

# test with the rename on the local side
hg up -C 1
HGMERGE=false hg merge

echo % show unresolved
hg resolve -l

echo % unmark baz
hg resolve -u baz

echo % show
hg resolve -l

echo % re-resolve baz
hg resolve baz

echo % after
hg resolve -l

echo % resolve all
hg resolve

echo % after
hg resolve -l

true