tests/test-resolve
author Sune Foldager <cryo@cyanite.org>
Mon, 11 May 2009 07:55:13 +0200
changeset 8344 873429914ec5
parent 8167 6c82beaaa11a
child 11451 51021f4c80b5
permissions -rwxr-xr-x
url: fix bug in passwordmgr related to auth configuration Usernames given as part of the URL would be ignored. This bug was introduced in 89c80c3dc5842d609e9ba13f08fd2cf7f127c25a

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