Mercurial > hg
view tests/test-resolve @ 10720:fbcccf9ec58f
check-code: add a return value to checkfile function
The checkfile function returns True if the file is correct, False
otherwise.
author | Pierre-Yves David <pierre-yves.david@logilab.fr> |
---|---|
date | Wed, 17 Mar 2010 10:51:26 +0100 |
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