Mercurial > hg
annotate tests/test-double-merge.out @ 7438:b80b944836ec
Add hgcia to hgext
author | Brendan Cully <brendan@kublai.com> |
---|---|
date | Thu, 27 Nov 2008 11:04:29 -0800 |
parents | 368a4ec603cc |
children | 50b6af595e0c |
rev | line source |
---|---|
6336
4b0c9c674707
warn about new heads on commit (issue842)
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
6004
diff
changeset
|
1 created new head |
5042
f191bc3916f7
merge: do early copy to deal with issue636
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
2 resolving manifests |
f191bc3916f7
merge: do early copy to deal with issue636
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
3 overwrite None partial False |
f191bc3916f7
merge: do early copy to deal with issue636
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
4 ancestor 310fd17130da local 2092631ce82b+ remote 7731dad1c2b9 |
5371
17ed9b9a0d03
merge: add debug diagnostics for findcopies
Matt Mackall <mpm@selenic.com>
parents:
5042
diff
changeset
|
5 searching for copies back to rev 1 |
17ed9b9a0d03
merge: add debug diagnostics for findcopies
Matt Mackall <mpm@selenic.com>
parents:
5042
diff
changeset
|
6 unmatched files in other: |
17ed9b9a0d03
merge: add debug diagnostics for findcopies
Matt Mackall <mpm@selenic.com>
parents:
5042
diff
changeset
|
7 bar |
17ed9b9a0d03
merge: add debug diagnostics for findcopies
Matt Mackall <mpm@selenic.com>
parents:
5042
diff
changeset
|
8 all copies found (* = to merge, ! = divergent): |
17ed9b9a0d03
merge: add debug diagnostics for findcopies
Matt Mackall <mpm@selenic.com>
parents:
5042
diff
changeset
|
9 bar -> foo * |
17ed9b9a0d03
merge: add debug diagnostics for findcopies
Matt Mackall <mpm@selenic.com>
parents:
5042
diff
changeset
|
10 checking for directory renames |
5042
f191bc3916f7
merge: do early copy to deal with issue636
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
11 foo: versions differ -> m |
f191bc3916f7
merge: do early copy to deal with issue636
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
12 foo: remote copied to bar -> m |
6512
368a4ec603cc
merge: introduce mergestate
Matt Mackall <mpm@selenic.com>
parents:
6336
diff
changeset
|
13 preserving foo for resolve of bar |
368a4ec603cc
merge: introduce mergestate
Matt Mackall <mpm@selenic.com>
parents:
6336
diff
changeset
|
14 preserving foo for resolve of foo |
368a4ec603cc
merge: introduce mergestate
Matt Mackall <mpm@selenic.com>
parents:
6336
diff
changeset
|
15 picked tool 'internal:merge' for bar (binary False symlink False) |
368a4ec603cc
merge: introduce mergestate
Matt Mackall <mpm@selenic.com>
parents:
6336
diff
changeset
|
16 merging foo and bar to bar |
368a4ec603cc
merge: introduce mergestate
Matt Mackall <mpm@selenic.com>
parents:
6336
diff
changeset
|
17 my bar@2092631ce82b+ other bar@7731dad1c2b9 ancestor foo@310fd17130da |
6004
5af5f0f9d724
merge: allow smarter tool configuration
Matt Mackall <mpm@selenic.com>
parents:
5371
diff
changeset
|
18 premerge successful |
5af5f0f9d724
merge: allow smarter tool configuration
Matt Mackall <mpm@selenic.com>
parents:
5371
diff
changeset
|
19 picked tool 'internal:merge' for foo (binary False symlink False) |
5042
f191bc3916f7
merge: do early copy to deal with issue636
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
20 merging foo |
f191bc3916f7
merge: do early copy to deal with issue636
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
21 my foo@2092631ce82b+ other foo@7731dad1c2b9 ancestor foo@310fd17130da |
6004
5af5f0f9d724
merge: allow smarter tool configuration
Matt Mackall <mpm@selenic.com>
parents:
5371
diff
changeset
|
22 premerge successful |
5042
f191bc3916f7
merge: do early copy to deal with issue636
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
23 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
|
24 (branch merge, don't forget to commit) |
f191bc3916f7
merge: do early copy to deal with issue636
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
25 -- foo -- |
f191bc3916f7
merge: do early copy to deal with issue636
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
26 line 0 |
f191bc3916f7
merge: do early copy to deal with issue636
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
27 line 1 |
f191bc3916f7
merge: do early copy to deal with issue636
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
28 line 2-1 |
f191bc3916f7
merge: do early copy to deal with issue636
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
29 -- bar -- |
f191bc3916f7
merge: do early copy to deal with issue636
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
30 line 0 |
f191bc3916f7
merge: do early copy to deal with issue636
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
31 line 1 |
f191bc3916f7
merge: do early copy to deal with issue636
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
32 line 2-2 |