Mercurial > hg
view tests/test-resolve @ 11746:46ac30b17978
revlog: add shallow header flag
REVLOGSHALLOW header flag to mark revlog as shallow.
The _shallow attribute of the revlog is used to check if the header flag is set.
author | Vishakh H <vsh426@gmail.com> |
---|---|
date | Tue, 03 Aug 2010 19:38:19 +0530 |
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