Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-rebuildstate @ 5390:36c46e20976a
merge: provide *_ISLINK environment vars to merge helper
Sets HG_MY_ISLINK, HG_OTHER_ISLINK, HG_BASE_ISLINK in environment. Without these variables, it's impossible for the merge application to know whether the 'other' and 'base' files were symlinks in their original contexts. For the purposes of the merge they are always emitted as small text files.
author | Patrick Mezard <pmezard@gmail.com> |
---|---|
date | Wed, 03 Oct 2007 23:09:36 +0200 |
parents | b304c2496f52 |
children |
line wrap: on
line source
#!/bin/sh # basic test for hg debugrebuildstate hg init repo cd repo touch foo bar hg ci -Am 'add foo bar' touch baz hg add baz hg rm bar echo '% state dump' hg debugstate | cut -b 1-16,35- | sort echo '% status' hg st -A hg debugrebuildstate echo '% state dump' hg debugstate | cut -b 1-16,35- | sort echo '% status' hg st -A