Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-pull-pull-corruption @ 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 | 81ca1a9bd061 |
children |
line wrap: on
line source
#!/bin/sh # # Corrupt an hg repo with two pulls. # # create one repo with a long history hg init source1 cd source1 touch foo hg add foo for i in 1 2 3 4 5 6 7 8 9 10; do echo $i >> foo hg ci -m $i done cd .. # create one repo with a shorter history hg clone -r 0 source1 source2 cd source2 echo a >> foo hg ci -m a cd .. # create a third repo to pull both other repos into it hg init corrupted cd corrupted # use a hook to make the second pull start while the first one is still running echo '[hooks]' >> .hg/hgrc echo 'prechangegroup = sleep 5' >> .hg/hgrc # start a pull... hg pull ../source1 & # ... and start another pull before the first one has finished sleep 1 hg pull ../source2 2>/dev/null # see the result wait hg verify