view tests/test-merge9 @ 6173:963000ed8cac

convert: add shallow, single branch svn conversions via svn.startrev
author Patrick Mezard <pmezard@gmail.com>
date Sun, 24 Feb 2008 17:58:55 +0100
parents dc5920ea12f8
children 92ccccb55ba3
line wrap: on
line source

#!/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

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

true