Mercurial > hg > mercurial-crew-with-dirclash
annotate tests/test-rollback.out @ 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 |
---|---|
336 | 1 checking changesets |
2 checking manifests | |
3 crosschecking files in changesets and manifests | |
4 checking files | |
5 1 files, 1 changesets, 1 total revisions | |
1933
7544700fd931
Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
981
diff
changeset
|
6 changeset: 0:0acdaf898367 |
388
398737777644
Fixed tests for displaying tags in hg history and hg parents.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
382
diff
changeset
|
7 tag: tip |
336 | 8 user: test |
1933
7544700fd931
Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
981
diff
changeset
|
9 date: Mon Jan 12 13:46:40 1970 +0000 |
336 | 10 summary: test |
11 | |
502 | 12 rolling back last transaction |
336 | 13 checking changesets |
14 checking manifests | |
15 crosschecking files in changesets and manifests | |
16 checking files | |
17 0 files, 0 changesets, 0 total revisions | |
18 A a |