view tests/test-resolve @ 11208:2313dc4d9817

tests: fix bashism to load helpers.sh `source` isn't available at POSIX sh.
author Yuya Nishihara <yuya@tcha.org>
date Fri, 21 May 2010 20:55:18 +0900
parents 6c82beaaa11a
children 51021f4c80b5
line wrap: on
line source

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