Mercurial > hg > mercurial-crew-with-dirclash
annotate tests/test-copy-move-merge.out @ 5374:e710874247d1
convert: allow the converter_source to say "skip this revision"
If getchanges returns a string, it's assumed to be the id of an
already converted revision. We map the current revision to the same
revision this converted revision was mapped to.
To allow skipping a root revision, getchanges can return the special
string 'hg-convert-skipped-revision' (a.k.a. common.SKIPREV), which
hopefully won't clash with any real id.
The converter_source is responsible for rewriting the parents of the
commit objects to make sure the revision graph makes sense.
author | Alexis S. L. Carvalho <alexis@cecm.usp.br> |
---|---|
date | Thu, 04 Oct 2007 23:21:37 -0300 |
parents | 17ed9b9a0d03 |
children |
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 |
8d9bdcbb2b18
merge: avoid double deletion mentioned in issue636
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
15 copying a to b |
8d9bdcbb2b18
merge: avoid double deletion mentioned in issue636
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
16 copying a to c |
8d9bdcbb2b18
merge: avoid double deletion mentioned in issue636
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
17 merging a and b |
8d9bdcbb2b18
merge: avoid double deletion mentioned in issue636
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
18 my a@fb3948d97f07+ other b@40da226db0f0 ancestor a@583c7b748052 |
8d9bdcbb2b18
merge: avoid double deletion mentioned in issue636
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
19 removing a |
8d9bdcbb2b18
merge: avoid double deletion mentioned in issue636
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
20 merging a and c |
8d9bdcbb2b18
merge: avoid double deletion mentioned in issue636
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
21 my a@fb3948d97f07+ other c@40da226db0f0 ancestor a@583c7b748052 |
8d9bdcbb2b18
merge: avoid double deletion mentioned in issue636
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
22 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
|
23 (branch merge, don't forget to commit) |
8d9bdcbb2b18
merge: avoid double deletion mentioned in issue636
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
24 -- b -- |
8d9bdcbb2b18
merge: avoid double deletion mentioned in issue636
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
25 0 |
8d9bdcbb2b18
merge: avoid double deletion mentioned in issue636
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
26 1 |
8d9bdcbb2b18
merge: avoid double deletion mentioned in issue636
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
27 2 |
8d9bdcbb2b18
merge: avoid double deletion mentioned in issue636
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
28 -- c -- |
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 |