Mercurial > hg
view tests/test-revlog-packentry @ 5503:6f26c7677463
Test a merge of a symlink against an executable file.
This should result in a conflict, but the symlink always wins.
author | Bryan O'Sullivan <bos@serpentine.com> |
---|---|
date | Fri, 02 Nov 2007 14:02:28 -0700 |
parents | f87685355c9c |
children |
line wrap: on
line source
#!/bin/sh hg init repo cd repo touch foo hg ci -Am 'add foo' hg up -C null # this should be stored as a delta against rev 0 echo foo bar baz > foo hg ci -Am 'add foo again' hg debugindex .hg/store/data/foo.i