tests/test-resolve
author Martin Geisler <mg@lazybytes.net>
Mon, 02 Nov 2009 21:55:59 +0100
changeset 9705 563a9c3a7d2e
parent 8167 6c82beaaa11a
child 11451 51021f4c80b5
permissions -rwxr-xr-x
hg.1: kill spurious backslash I believe the backslash prevented asciidoc from automatically turning "(C)" into a real copyright symbol. This replacement is not done in reST in the first place.

#!/bin/sh

# test that a commit clears the merge state.

hg init repo
cd repo

echo foo > file
hg commit -Am 'add file'

echo bar >> file
hg commit -Am 'append bar'

echo % create a second head
hg up -C 0
echo baz >> file
hg commit -Am 'append baz'

echo % failing merge
HGMERGE=internal:fail hg merge

echo resolved > file
hg resolve -m file
hg commit -m 'resolved'

echo % resolve -l, should be empty
hg resolve -l