tests/test-resolve
author Brodie Rao <me+hg@dackz.net>
Mon, 10 Aug 2009 22:59:29 +0200
changeset 9330 be2a13153372
parent 8167 6c82beaaa11a
child 11451 51021f4c80b5
permissions -rwxr-xr-x
diffstat: scale adds/removes proportionally to graph width The previous method of scaling had a tendency to include graph lines that went past the output width when the file with the most changes had a very large number of changes.

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