Mercurial > hg > mercurial-crew-with-dirclash
annotate tests/test-double-merge.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 | 17ed9b9a0d03 |
children |
rev | line source |
---|---|
5045
f191bc3916f7
merge: do early copy to deal with issue636
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
1 resolving manifests |
f191bc3916f7
merge: do early copy to deal with issue636
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
2 overwrite None partial False |
f191bc3916f7
merge: do early copy to deal with issue636
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
3 ancestor 310fd17130da local 2092631ce82b+ remote 7731dad1c2b9 |
5371
17ed9b9a0d03
merge: add debug diagnostics for findcopies
Matt Mackall <mpm@selenic.com>
parents:
5045
diff
changeset
|
4 searching for copies back to rev 1 |
17ed9b9a0d03
merge: add debug diagnostics for findcopies
Matt Mackall <mpm@selenic.com>
parents:
5045
diff
changeset
|
5 unmatched files in other: |
17ed9b9a0d03
merge: add debug diagnostics for findcopies
Matt Mackall <mpm@selenic.com>
parents:
5045
diff
changeset
|
6 bar |
17ed9b9a0d03
merge: add debug diagnostics for findcopies
Matt Mackall <mpm@selenic.com>
parents:
5045
diff
changeset
|
7 all copies found (* = to merge, ! = divergent): |
17ed9b9a0d03
merge: add debug diagnostics for findcopies
Matt Mackall <mpm@selenic.com>
parents:
5045
diff
changeset
|
8 bar -> foo * |
17ed9b9a0d03
merge: add debug diagnostics for findcopies
Matt Mackall <mpm@selenic.com>
parents:
5045
diff
changeset
|
9 checking for directory renames |
5045
f191bc3916f7
merge: do early copy to deal with issue636
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
10 foo: versions differ -> m |
f191bc3916f7
merge: do early copy to deal with issue636
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
11 foo: remote copied to bar -> m |
f191bc3916f7
merge: do early copy to deal with issue636
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
12 copying foo to bar |
f191bc3916f7
merge: do early copy to deal with issue636
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
13 merging foo and bar |
f191bc3916f7
merge: do early copy to deal with issue636
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
14 my foo@2092631ce82b+ other bar@7731dad1c2b9 ancestor foo@310fd17130da |
f191bc3916f7
merge: do early copy to deal with issue636
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
15 merging foo |
f191bc3916f7
merge: do early copy to deal with issue636
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
16 my foo@2092631ce82b+ other foo@7731dad1c2b9 ancestor foo@310fd17130da |
f191bc3916f7
merge: do early copy to deal with issue636
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
17 0 files updated, 2 files merged, 0 files removed, 0 files unresolved |
f191bc3916f7
merge: do early copy to deal with issue636
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
18 (branch merge, don't forget to commit) |
f191bc3916f7
merge: do early copy to deal with issue636
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
19 -- foo -- |
f191bc3916f7
merge: do early copy to deal with issue636
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
20 line 0 |
f191bc3916f7
merge: do early copy to deal with issue636
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
21 line 1 |
f191bc3916f7
merge: do early copy to deal with issue636
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
22 line 2-1 |
f191bc3916f7
merge: do early copy to deal with issue636
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
23 -- bar -- |
f191bc3916f7
merge: do early copy to deal with issue636
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
24 line 0 |
f191bc3916f7
merge: do early copy to deal with issue636
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
25 line 1 |
f191bc3916f7
merge: do early copy to deal with issue636
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
26 line 2-2 |