Mercurial > hg
view tests/test-resolve @ 12028:21984c1c83d4 stable
test-dispatch: drop test for missing working directory
hstuart reported problems when the local Python has been configured to do stuff
and crash before reaching the expected error handler.
author | Mads Kiilerich <mads@kiilerich.com> |
---|---|
date | Mon, 23 Aug 2010 22:32:36 +0200 |
parents | 51021f4c80b5 |
children |
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 # test crashed merge with empty mergestate mkdir .hg/merge touch .hg/merge/state echo % resolve -l, should be empty hg resolve -l