Mercurial > hg > mercurial-crew-with-dirclash
annotate tests/test-rename-dir-merge.out @ 5416:ca890c0c3f1f
osutil.c: style fix - delete trailing end-of-line spaces
author | Giorgos Keramidas <keramida@ceid.upatras.gr> |
---|---|
date | Sun, 07 Oct 2007 21:56:36 +0300 |
parents | 17ed9b9a0d03 |
children |
rev | line source |
---|---|
3735 | 1 adding a/a |
2 adding a/b | |
3 0 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
4 copying a/a to b/a | |
5 copying a/b to b/b | |
6 removing a/a | |
7 removing a/b | |
8 2 files updated, 0 files merged, 2 files removed, 0 files unresolved | |
9 resolving manifests | |
10 overwrite None partial False | |
11 ancestor f9b20c0d4c51 local ce36d17b18fb+ remote 55119e611c80 | |
5371
17ed9b9a0d03
merge: add debug diagnostics for findcopies
Matt Mackall <mpm@selenic.com>
parents:
5244
diff
changeset
|
12 searching for copies back to rev 1 |
17ed9b9a0d03
merge: add debug diagnostics for findcopies
Matt Mackall <mpm@selenic.com>
parents:
5244
diff
changeset
|
13 unmatched files in local: |
17ed9b9a0d03
merge: add debug diagnostics for findcopies
Matt Mackall <mpm@selenic.com>
parents:
5244
diff
changeset
|
14 a/c |
17ed9b9a0d03
merge: add debug diagnostics for findcopies
Matt Mackall <mpm@selenic.com>
parents:
5244
diff
changeset
|
15 unmatched files in other: |
17ed9b9a0d03
merge: add debug diagnostics for findcopies
Matt Mackall <mpm@selenic.com>
parents:
5244
diff
changeset
|
16 b/a |
17ed9b9a0d03
merge: add debug diagnostics for findcopies
Matt Mackall <mpm@selenic.com>
parents:
5244
diff
changeset
|
17 b/b |
17ed9b9a0d03
merge: add debug diagnostics for findcopies
Matt Mackall <mpm@selenic.com>
parents:
5244
diff
changeset
|
18 all copies found (* = to merge, ! = divergent): |
17ed9b9a0d03
merge: add debug diagnostics for findcopies
Matt Mackall <mpm@selenic.com>
parents:
5244
diff
changeset
|
19 b/a -> a/a |
17ed9b9a0d03
merge: add debug diagnostics for findcopies
Matt Mackall <mpm@selenic.com>
parents:
5244
diff
changeset
|
20 b/b -> a/b |
17ed9b9a0d03
merge: add debug diagnostics for findcopies
Matt Mackall <mpm@selenic.com>
parents:
5244
diff
changeset
|
21 checking for directory renames |
17ed9b9a0d03
merge: add debug diagnostics for findcopies
Matt Mackall <mpm@selenic.com>
parents:
5244
diff
changeset
|
22 dir a/ -> b/ |
17ed9b9a0d03
merge: add debug diagnostics for findcopies
Matt Mackall <mpm@selenic.com>
parents:
5244
diff
changeset
|
23 file a/c -> b/c |
3735 | 24 a/c: remote renamed directory to b/c -> d |
4416
bb1800a7d7e1
merge: fix spurious merges for copies in linear updates
Matt Mackall <mpm@selenic.com>
parents:
4311
diff
changeset
|
25 a/b: other deleted -> r |
bb1800a7d7e1
merge: fix spurious merges for copies in linear updates
Matt Mackall <mpm@selenic.com>
parents:
4311
diff
changeset
|
26 a/a: other deleted -> r |
bb1800a7d7e1
merge: fix spurious merges for copies in linear updates
Matt Mackall <mpm@selenic.com>
parents:
4311
diff
changeset
|
27 b/a: remote created -> g |
bb1800a7d7e1
merge: fix spurious merges for copies in linear updates
Matt Mackall <mpm@selenic.com>
parents:
4311
diff
changeset
|
28 b/b: remote created -> g |
3735 | 29 removing a/a |
30 removing a/b | |
31 moving a/c to b/c | |
4416
bb1800a7d7e1
merge: fix spurious merges for copies in linear updates
Matt Mackall <mpm@selenic.com>
parents:
4311
diff
changeset
|
32 getting b/a |
bb1800a7d7e1
merge: fix spurious merges for copies in linear updates
Matt Mackall <mpm@selenic.com>
parents:
4311
diff
changeset
|
33 getting b/b |
bb1800a7d7e1
merge: fix spurious merges for copies in linear updates
Matt Mackall <mpm@selenic.com>
parents:
4311
diff
changeset
|
34 3 files updated, 0 files merged, 2 files removed, 0 files unresolved |
3735 | 35 (branch merge, don't forget to commit) |
3748
7b88bd88f040
Fix test-rename-dir-merge for different implementations of ls.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
3735
diff
changeset
|
36 a/* b/a b/b b/c |
3735 | 37 M b/a |
38 M b/b | |
39 A b/c | |
40 a/c | |
41 R a/a | |
42 R a/b | |
43 R a/c | |
5244
dee573ba79f1
correctly record file-level history when the local side renames a directory
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
4416
diff
changeset
|
44 b/c renamed from a/c:354ae8da6e890359ef49ade27b68bbc361f3ca88 |
4416
bb1800a7d7e1
merge: fix spurious merges for copies in linear updates
Matt Mackall <mpm@selenic.com>
parents:
4311
diff
changeset
|
45 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
3735 | 46 resolving manifests |
47 overwrite None partial False | |
48 ancestor f9b20c0d4c51 local 55119e611c80+ remote ce36d17b18fb | |
5371
17ed9b9a0d03
merge: add debug diagnostics for findcopies
Matt Mackall <mpm@selenic.com>
parents:
5244
diff
changeset
|
49 searching for copies back to rev 1 |
17ed9b9a0d03
merge: add debug diagnostics for findcopies
Matt Mackall <mpm@selenic.com>
parents:
5244
diff
changeset
|
50 unmatched files in local: |
17ed9b9a0d03
merge: add debug diagnostics for findcopies
Matt Mackall <mpm@selenic.com>
parents:
5244
diff
changeset
|
51 b/a |
17ed9b9a0d03
merge: add debug diagnostics for findcopies
Matt Mackall <mpm@selenic.com>
parents:
5244
diff
changeset
|
52 b/b |
17ed9b9a0d03
merge: add debug diagnostics for findcopies
Matt Mackall <mpm@selenic.com>
parents:
5244
diff
changeset
|
53 unmatched files in other: |
17ed9b9a0d03
merge: add debug diagnostics for findcopies
Matt Mackall <mpm@selenic.com>
parents:
5244
diff
changeset
|
54 a/c |
17ed9b9a0d03
merge: add debug diagnostics for findcopies
Matt Mackall <mpm@selenic.com>
parents:
5244
diff
changeset
|
55 all copies found (* = to merge, ! = divergent): |
17ed9b9a0d03
merge: add debug diagnostics for findcopies
Matt Mackall <mpm@selenic.com>
parents:
5244
diff
changeset
|
56 b/a -> a/a |
17ed9b9a0d03
merge: add debug diagnostics for findcopies
Matt Mackall <mpm@selenic.com>
parents:
5244
diff
changeset
|
57 b/b -> a/b |
17ed9b9a0d03
merge: add debug diagnostics for findcopies
Matt Mackall <mpm@selenic.com>
parents:
5244
diff
changeset
|
58 checking for directory renames |
17ed9b9a0d03
merge: add debug diagnostics for findcopies
Matt Mackall <mpm@selenic.com>
parents:
5244
diff
changeset
|
59 dir a/ -> b/ |
17ed9b9a0d03
merge: add debug diagnostics for findcopies
Matt Mackall <mpm@selenic.com>
parents:
5244
diff
changeset
|
60 file a/c -> b/c |
3735 | 61 None: local renamed directory to b/c -> d |
62 getting a/c to b/c | |
4416
bb1800a7d7e1
merge: fix spurious merges for copies in linear updates
Matt Mackall <mpm@selenic.com>
parents:
4311
diff
changeset
|
63 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
3735 | 64 (branch merge, don't forget to commit) |
3748
7b88bd88f040
Fix test-rename-dir-merge for different implementations of ls.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
3735
diff
changeset
|
65 a/* b/a b/b b/c |
3735 | 66 A b/c |
67 a/c | |
5244
dee573ba79f1
correctly record file-level history when the local side renames a directory
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
4416
diff
changeset
|
68 b/c renamed from a/c:354ae8da6e890359ef49ade27b68bbc361f3ca88 |