view tests/test-resolve @ 10924:b2860654e588

merge with stable
author Benoit Boissinot <benoit.boissinot@ens-lyon.org>
date Thu, 15 Apr 2010 20:25:26 +0200
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