Mercurial > hg
view tests/test-resolve @ 11999:62e2bbf523f2
revlog: generate full revisions when parent node is missing
The full revision is sent if the first parent, against which diff is calculated, is
missing at remote. This happens in the case of shallow clones.
author | Vishakh H <vsh426@gmail.com> |
---|---|
date | Fri, 13 Aug 2010 19:41:51 +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