view tests/test-resolve @ 7769:8c06d4bf2c23

test-merge-tools: Don't use tac "tac" was a bad tool - is not available on all platforms. The test now only uses the "tools" true, false, head, echo, cat and /bin/cat
author Mads Kiilerich <mads@kiilerich.com>
date Tue, 10 Feb 2009 16:11:48 +0100
parents 9f73bddb9d0b
children 6c82beaaa11a
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' -d '0 0'

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

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

echo % failing merge
HGMERGE=internal:fail hg merge

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

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