Mercurial > hg > mercurial-crew-with-dirclash
annotate tests/test-rollback @ 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 | 4f072bb06e89 |
| children |
| rev | line source |
|---|---|
|
544
3d4d5f2aba9a
Remove bashisms and use /bin/sh instead of /bin/bash.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
350
diff
changeset
|
1 #!/bin/sh |
| 336 | 2 |
| 3 mkdir t | |
| 4 cd t | |
| 5 hg init | |
| 6 echo a > a | |
| 7 hg add a | |
|
1933
7544700fd931
Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
814
diff
changeset
|
8 hg commit -m "test" -d "1000000 0" |
| 336 | 9 hg verify |
| 10 hg parents | |
| 11 hg status | |
|
2227
4f072bb06e89
deprecate undo command, replace with rollback command.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
1933
diff
changeset
|
12 hg rollback |
| 336 | 13 hg verify |
| 14 hg parents | |
| 15 hg status |