Mercurial > hg > mercurial-crew-with-dirclash
annotate tests/test-convert @ 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 | 36e8983fe44d |
children | 71e7c86adcb7 |
rev | line source |
---|---|
5015 | 1 #!/bin/sh |
2 | |
3 echo "[extensions]" >> $HGRCPATH | |
4 echo "convert=" >> $HGRCPATH | |
5 | |
6 hg init a | |
7 cd a | |
8 echo a > a | |
9 hg ci -d'0 0' -Ama | |
10 hg cp a b | |
11 hg ci -d'1 0' -mb | |
12 hg rm a | |
13 hg ci -d'2 0' -mc | |
14 hg mv b a | |
15 hg ci -d'3 0' -md | |
16 echo a >> a | |
17 hg ci -d'4 0' -me | |
18 | |
19 cd .. | |
5028
36e8983fe44d
test-convert: Hide warning about missing subversion bindings.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
5015
diff
changeset
|
20 hg convert a 2>&1 | grep -v 'subversion python bindings could not be loaded' |
5015 | 21 hg --cwd a-hg pull ../a |