Mercurial > hg > mercurial-crew-with-dirclash
annotate tests/test-ro-message @ 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 | e506c14382fd |
children |
rev | line source |
---|---|
1355
9116fe491b06
Test case for the misleading message on bad permissions.
Eric Hopper <hopper@omnifarious.org>
parents:
diff
changeset
|
1 #!/bin/sh |
9116fe491b06
Test case for the misleading message on bad permissions.
Eric Hopper <hopper@omnifarious.org>
parents:
diff
changeset
|
2 HG=hg |
9116fe491b06
Test case for the misleading message on bad permissions.
Eric Hopper <hopper@omnifarious.org>
parents:
diff
changeset
|
3 "$HG" init |
9116fe491b06
Test case for the misleading message on bad permissions.
Eric Hopper <hopper@omnifarious.org>
parents:
diff
changeset
|
4 mkdir b |
9116fe491b06
Test case for the misleading message on bad permissions.
Eric Hopper <hopper@omnifarious.org>
parents:
diff
changeset
|
5 echo 'Bouncy' >b/bouncy |
9116fe491b06
Test case for the misleading message on bad permissions.
Eric Hopper <hopper@omnifarious.org>
parents:
diff
changeset
|
6 echo 'tricycle' >b/vehicle |
9116fe491b06
Test case for the misleading message on bad permissions.
Eric Hopper <hopper@omnifarious.org>
parents:
diff
changeset
|
7 "$HG" add b/bouncy |
9116fe491b06
Test case for the misleading message on bad permissions.
Eric Hopper <hopper@omnifarious.org>
parents:
diff
changeset
|
8 "$HG" add b/vehicle |
9116fe491b06
Test case for the misleading message on bad permissions.
Eric Hopper <hopper@omnifarious.org>
parents:
diff
changeset
|
9 "$HG" commit -m 'Adding bouncy' |
9116fe491b06
Test case for the misleading message on bad permissions.
Eric Hopper <hopper@omnifarious.org>
parents:
diff
changeset
|
10 echo 'bouncy' >>b/bouncy |
9116fe491b06
Test case for the misleading message on bad permissions.
Eric Hopper <hopper@omnifarious.org>
parents:
diff
changeset
|
11 "$HG" commit -m 'Making it bouncier' |
9116fe491b06
Test case for the misleading message on bad permissions.
Eric Hopper <hopper@omnifarious.org>
parents:
diff
changeset
|
12 "$HG" update -C 0 |
9116fe491b06
Test case for the misleading message on bad permissions.
Eric Hopper <hopper@omnifarious.org>
parents:
diff
changeset
|
13 echo 'stationary' >>b/vehicle |
9116fe491b06
Test case for the misleading message on bad permissions.
Eric Hopper <hopper@omnifarious.org>
parents:
diff
changeset
|
14 "$HG" commit -m 'Clarifying the vehicle.' |
9116fe491b06
Test case for the misleading message on bad permissions.
Eric Hopper <hopper@omnifarious.org>
parents:
diff
changeset
|
15 "$HG" update -C 1 |
9116fe491b06
Test case for the misleading message on bad permissions.
Eric Hopper <hopper@omnifarious.org>
parents:
diff
changeset
|
16 chmod a-w b/vehicle |
2283
e506c14382fd
deprecate 'update -m'. use 'merge' instead.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
1738
diff
changeset
|
17 "$HG" merge 2 2>&1 | sed 's|^\(.*[ ]\).*/\([^/]*/[^/]*/[^/]*\)$|\1\2|g' |