Mercurial > hg

annotate tests/test-copy-move-merge.out @ 6512:368a4ec603cc

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge: introduce mergestate
author Matt Mackall <mpm@selenic.com>
date Thu, 10 Apr 2008 15:02:24 -0500
parents 5af5f0f9d724
children af5f099d932b
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
5059
8d9bdcbb2b18 merge: avoid double deletion mentioned in issue636
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
1 1 files updated, 0 files merged, 2 files removed, 0 files unresolved
8d9bdcbb2b18 merge: avoid double deletion mentioned in issue636
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
2 resolving manifests
8d9bdcbb2b18 merge: avoid double deletion mentioned in issue636
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
3 overwrite None partial False
8d9bdcbb2b18 merge: avoid double deletion mentioned in issue636
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
4 ancestor 583c7b748052 local fb3948d97f07+ remote 40da226db0f0
5371
17ed9b9a0d03 merge: add debug diagnostics for findcopies
Matt Mackall <mpm@selenic.com>
parents: 5059
diff changeset
5 searching for copies back to rev 1
17ed9b9a0d03 merge: add debug diagnostics for findcopies
Matt Mackall <mpm@selenic.com>
parents: 5059
diff changeset
6 unmatched files in other:
17ed9b9a0d03 merge: add debug diagnostics for findcopies
Matt Mackall <mpm@selenic.com>
parents: 5059
diff changeset
7 b
17ed9b9a0d03 merge: add debug diagnostics for findcopies
Matt Mackall <mpm@selenic.com>
parents: 5059
diff changeset
8 c
17ed9b9a0d03 merge: add debug diagnostics for findcopies
Matt Mackall <mpm@selenic.com>
parents: 5059
diff changeset
9 all copies found (* = to merge, ! = divergent):
17ed9b9a0d03 merge: add debug diagnostics for findcopies
Matt Mackall <mpm@selenic.com>
parents: 5059
diff changeset
10 c -> a *
17ed9b9a0d03 merge: add debug diagnostics for findcopies
Matt Mackall <mpm@selenic.com>
parents: 5059
diff changeset
11 b -> a *
17ed9b9a0d03 merge: add debug diagnostics for findcopies
Matt Mackall <mpm@selenic.com>
parents: 5059
diff changeset
12 checking for directory renames
5059
8d9bdcbb2b18 merge: avoid double deletion mentioned in issue636
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
13 a: remote moved to c -> m
8d9bdcbb2b18 merge: avoid double deletion mentioned in issue636
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
14 a: remote moved to b -> m
6512
368a4ec603cc merge: introduce mergestate
Matt Mackall <mpm@selenic.com>
parents: 6004
diff changeset
15 preserving a for resolve of b
368a4ec603cc merge: introduce mergestate
Matt Mackall <mpm@selenic.com>
parents: 6004
diff changeset
16 preserving a for resolve of c
368a4ec603cc merge: introduce mergestate
Matt Mackall <mpm@selenic.com>
parents: 6004
diff changeset
17 removing a
368a4ec603cc merge: introduce mergestate
Matt Mackall <mpm@selenic.com>
parents: 6004
diff changeset
18 picked tool 'internal:merge' for b (binary False symlink False)
368a4ec603cc merge: introduce mergestate
Matt Mackall <mpm@selenic.com>
parents: 6004
diff changeset
19 merging a and b to b
368a4ec603cc merge: introduce mergestate
Matt Mackall <mpm@selenic.com>
parents: 6004
diff changeset
20 my b@fb3948d97f07+ other b@40da226db0f0 ancestor a@583c7b748052
6004
5af5f0f9d724 merge: allow smarter tool configuration
Matt Mackall <mpm@selenic.com>
parents: 5371
diff changeset
21 premerge successful
6512
368a4ec603cc merge: introduce mergestate
Matt Mackall <mpm@selenic.com>
parents: 6004
diff changeset
22 picked tool 'internal:merge' for c (binary False symlink False)
368a4ec603cc merge: introduce mergestate
Matt Mackall <mpm@selenic.com>
parents: 6004
diff changeset
23 merging a and c to c
368a4ec603cc merge: introduce mergestate
Matt Mackall <mpm@selenic.com>
parents: 6004
diff changeset
24 my c@fb3948d97f07+ other c@40da226db0f0 ancestor a@583c7b748052
6004
5af5f0f9d724 merge: allow smarter tool configuration
Matt Mackall <mpm@selenic.com>
parents: 5371
diff changeset
25 premerge successful
5059
8d9bdcbb2b18 merge: avoid double deletion mentioned in issue636
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
26 0 files updated, 2 files merged, 0 files removed, 0 files unresolved
8d9bdcbb2b18 merge: avoid double deletion mentioned in issue636
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
27 (branch merge, don't forget to commit)
8d9bdcbb2b18 merge: avoid double deletion mentioned in issue636
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
28 -- b --
8d9bdcbb2b18 merge: avoid double deletion mentioned in issue636
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
29 0
8d9bdcbb2b18 merge: avoid double deletion mentioned in issue636
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
30 1
8d9bdcbb2b18 merge: avoid double deletion mentioned in issue636
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
31 2
8d9bdcbb2b18 merge: avoid double deletion mentioned in issue636
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
32 -- c --
8d9bdcbb2b18 merge: avoid double deletion mentioned in issue636
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
33 0
8d9bdcbb2b18 merge: avoid double deletion mentioned in issue636
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
34 1
8d9bdcbb2b18 merge: avoid double deletion mentioned in issue636
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
35 2