Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-pull-r @ 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 | 8ede77c2d008 |
children |
line wrap: on
line source
#!/bin/sh hg init repo cd repo echo foo > foo hg ci -qAm 'add foo' -d '0 0' echo >> foo hg ci -m 'change foo' -d '0 0' hg up -qC 0 echo bar > bar hg ci -qAm 'add bar' -d '0 0' hg log cd .. hg init copy cd copy echo '% pull -r 0' hg pull -qr 0 ../repo hg log echo '% pull -r 1' hg pull -qr 1 ../repo hg log # this used to abort: received changelog group is empty echo '% pull -r 1 again' hg pull -qr 1 ../repo