Mercurial > hg > mercurial-crew-with-dirclash
annotate tests/test-simple-update.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 | 9d1c3529ebbc |
children | 8feb33c2d153 |
rev | line source |
---|---|
767
61ed30e82b27
Update tests to match new addremove chattiness.
Bryan O'Sullivan <bos@serpentine.com>
parents:
749
diff
changeset
|
1 adding foo |
331 | 2 checking changesets |
3 checking manifests | |
4 crosschecking files in changesets and manifests | |
5 checking files | |
6 1 files, 1 changesets, 1 total revisions | |
2175
b2ae81a7df29
Make hg update more verbose by default (issue12)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
2152
diff
changeset
|
7 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
b2ae81a7df29
Make hg update more verbose by default (issue12)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
2152
diff
changeset
|
8 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
404 | 9 pulling from ../branch |
331 | 10 searching for changes |
11 adding changesets | |
12 adding manifests | |
775 | 13 adding file changes |
14 added 1 changesets with 1 changes to 1 files | |
404 | 15 (run 'hg update' to get a working copy) |
331 | 16 checking changesets |
17 checking manifests | |
18 crosschecking files in changesets and manifests | |
19 checking files | |
20 1 files, 2 changesets, 2 total revisions | |
2175
b2ae81a7df29
Make hg update more verbose by default (issue12)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
2152
diff
changeset
|
21 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
331 | 22 foo |
23 bar | |
24 6f4310b00b9a147241b071a60c28a650827fb03d 644 foo |