Mercurial > hg
annotate tests/test-rename-dir-merge.out @ 5567:56e9f7b2d8fa
rename: add test for moving untracked files in directories
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Sat, 01 Dec 2007 12:54:34 -0600 |
parents | 17ed9b9a0d03 |
children | 2493a478f395 |
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:
5229
diff
changeset
|
12 searching for copies back to rev 1 |
17ed9b9a0d03
merge: add debug diagnostics for findcopies
Matt Mackall <mpm@selenic.com>
parents:
5229
diff
changeset
|
13 unmatched files in local: |
17ed9b9a0d03
merge: add debug diagnostics for findcopies
Matt Mackall <mpm@selenic.com>
parents:
5229
diff
changeset
|
14 a/c |
5567
56e9f7b2d8fa
rename: add test for moving untracked files in directories
Matt Mackall <mpm@selenic.com>
parents:
5371
diff
changeset
|
15 a/d |
5371
17ed9b9a0d03
merge: add debug diagnostics for findcopies
Matt Mackall <mpm@selenic.com>
parents:
5229
diff
changeset
|
16 unmatched files in other: |
17ed9b9a0d03
merge: add debug diagnostics for findcopies
Matt Mackall <mpm@selenic.com>
parents:
5229
diff
changeset
|
17 b/a |
17ed9b9a0d03
merge: add debug diagnostics for findcopies
Matt Mackall <mpm@selenic.com>
parents:
5229
diff
changeset
|
18 b/b |
17ed9b9a0d03
merge: add debug diagnostics for findcopies
Matt Mackall <mpm@selenic.com>
parents:
5229
diff
changeset
|
19 all copies found (* = to merge, ! = divergent): |
17ed9b9a0d03
merge: add debug diagnostics for findcopies
Matt Mackall <mpm@selenic.com>
parents:
5229
diff
changeset
|
20 b/a -> a/a |
17ed9b9a0d03
merge: add debug diagnostics for findcopies
Matt Mackall <mpm@selenic.com>
parents:
5229
diff
changeset
|
21 b/b -> a/b |
17ed9b9a0d03
merge: add debug diagnostics for findcopies
Matt Mackall <mpm@selenic.com>
parents:
5229
diff
changeset
|
22 checking for directory renames |
17ed9b9a0d03
merge: add debug diagnostics for findcopies
Matt Mackall <mpm@selenic.com>
parents:
5229
diff
changeset
|
23 dir a/ -> b/ |
17ed9b9a0d03
merge: add debug diagnostics for findcopies
Matt Mackall <mpm@selenic.com>
parents:
5229
diff
changeset
|
24 file a/c -> b/c |
5567
56e9f7b2d8fa
rename: add test for moving untracked files in directories
Matt Mackall <mpm@selenic.com>
parents:
5371
diff
changeset
|
25 file a/d -> b/d |
56e9f7b2d8fa
rename: add test for moving untracked files in directories
Matt Mackall <mpm@selenic.com>
parents:
5371
diff
changeset
|
26 a/d: remote renamed directory to b/d -> d |
3735 | 27 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:
4304
diff
changeset
|
28 a/b: other deleted -> r |
bb1800a7d7e1
merge: fix spurious merges for copies in linear updates
Matt Mackall <mpm@selenic.com>
parents:
4304
diff
changeset
|
29 a/a: other deleted -> r |
bb1800a7d7e1
merge: fix spurious merges for copies in linear updates
Matt Mackall <mpm@selenic.com>
parents:
4304
diff
changeset
|
30 b/a: remote created -> g |
bb1800a7d7e1
merge: fix spurious merges for copies in linear updates
Matt Mackall <mpm@selenic.com>
parents:
4304
diff
changeset
|
31 b/b: remote created -> g |
3735 | 32 removing a/a |
33 removing a/b | |
34 moving a/c to b/c | |
5567
56e9f7b2d8fa
rename: add test for moving untracked files in directories
Matt Mackall <mpm@selenic.com>
parents:
5371
diff
changeset
|
35 moving a/d to b/d |
4416
bb1800a7d7e1
merge: fix spurious merges for copies in linear updates
Matt Mackall <mpm@selenic.com>
parents:
4304
diff
changeset
|
36 getting b/a |
bb1800a7d7e1
merge: fix spurious merges for copies in linear updates
Matt Mackall <mpm@selenic.com>
parents:
4304
diff
changeset
|
37 getting b/b |
5567
56e9f7b2d8fa
rename: add test for moving untracked files in directories
Matt Mackall <mpm@selenic.com>
parents:
5371
diff
changeset
|
38 4 files updated, 0 files merged, 2 files removed, 0 files unresolved |
3735 | 39 (branch merge, don't forget to commit) |
5567
56e9f7b2d8fa
rename: add test for moving untracked files in directories
Matt Mackall <mpm@selenic.com>
parents:
5371
diff
changeset
|
40 a/* b/a b/b b/c b/d |
3735 | 41 M b/a |
42 M b/b | |
43 A b/c | |
44 a/c | |
45 R a/a | |
46 R a/b | |
47 R a/c | |
5567
56e9f7b2d8fa
rename: add test for moving untracked files in directories
Matt Mackall <mpm@selenic.com>
parents:
5371
diff
changeset
|
48 ? b/d |
5229
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
|
49 b/c renamed from a/c:354ae8da6e890359ef49ade27b68bbc361f3ca88 |
4416
bb1800a7d7e1
merge: fix spurious merges for copies in linear updates
Matt Mackall <mpm@selenic.com>
parents:
4304
diff
changeset
|
50 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
3735 | 51 resolving manifests |
52 overwrite None partial False | |
53 ancestor f9b20c0d4c51 local 55119e611c80+ remote ce36d17b18fb | |
5371
17ed9b9a0d03
merge: add debug diagnostics for findcopies
Matt Mackall <mpm@selenic.com>
parents:
5229
diff
changeset
|
54 searching for copies back to rev 1 |
17ed9b9a0d03
merge: add debug diagnostics for findcopies
Matt Mackall <mpm@selenic.com>
parents:
5229
diff
changeset
|
55 unmatched files in local: |
17ed9b9a0d03
merge: add debug diagnostics for findcopies
Matt Mackall <mpm@selenic.com>
parents:
5229
diff
changeset
|
56 b/a |
17ed9b9a0d03
merge: add debug diagnostics for findcopies
Matt Mackall <mpm@selenic.com>
parents:
5229
diff
changeset
|
57 b/b |
5567
56e9f7b2d8fa
rename: add test for moving untracked files in directories
Matt Mackall <mpm@selenic.com>
parents:
5371
diff
changeset
|
58 b/d |
5371
17ed9b9a0d03
merge: add debug diagnostics for findcopies
Matt Mackall <mpm@selenic.com>
parents:
5229
diff
changeset
|
59 unmatched files in other: |
17ed9b9a0d03
merge: add debug diagnostics for findcopies
Matt Mackall <mpm@selenic.com>
parents:
5229
diff
changeset
|
60 a/c |
17ed9b9a0d03
merge: add debug diagnostics for findcopies
Matt Mackall <mpm@selenic.com>
parents:
5229
diff
changeset
|
61 all copies found (* = to merge, ! = divergent): |
17ed9b9a0d03
merge: add debug diagnostics for findcopies
Matt Mackall <mpm@selenic.com>
parents:
5229
diff
changeset
|
62 b/a -> a/a |
17ed9b9a0d03
merge: add debug diagnostics for findcopies
Matt Mackall <mpm@selenic.com>
parents:
5229
diff
changeset
|
63 b/b -> a/b |
17ed9b9a0d03
merge: add debug diagnostics for findcopies
Matt Mackall <mpm@selenic.com>
parents:
5229
diff
changeset
|
64 checking for directory renames |
17ed9b9a0d03
merge: add debug diagnostics for findcopies
Matt Mackall <mpm@selenic.com>
parents:
5229
diff
changeset
|
65 dir a/ -> b/ |
17ed9b9a0d03
merge: add debug diagnostics for findcopies
Matt Mackall <mpm@selenic.com>
parents:
5229
diff
changeset
|
66 file a/c -> b/c |
3735 | 67 None: local renamed directory to b/c -> d |
68 getting a/c to b/c | |
4416
bb1800a7d7e1
merge: fix spurious merges for copies in linear updates
Matt Mackall <mpm@selenic.com>
parents:
4304
diff
changeset
|
69 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
3735 | 70 (branch merge, don't forget to commit) |
5567
56e9f7b2d8fa
rename: add test for moving untracked files in directories
Matt Mackall <mpm@selenic.com>
parents:
5371
diff
changeset
|
71 a/* b/a b/b b/c b/d |
3735 | 72 A b/c |
73 a/c | |
5567
56e9f7b2d8fa
rename: add test for moving untracked files in directories
Matt Mackall <mpm@selenic.com>
parents:
5371
diff
changeset
|
74 ? b/d |
5229
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
|
75 b/c renamed from a/c:354ae8da6e890359ef49ade27b68bbc361f3ca88 |