Mercurial > hg
view tests/test-resolve @ 11692:52e4ac3e63f7 stable
tag: do not allow tag names to consist solely of whitespace (issue2307)
(simplification and test by mpm)
author | Benjamin Pollack <benjamin@bitquabit.com> |
---|---|
date | Tue, 27 Jul 2010 14:40:25 -0400 |
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