Mercurial > hg
annotate tests/test-rename-dir-merge.out @ 7007:a6b74fbb5ce0
fetch: added support for named branches
Previously, fetch didn't really work when there were multiple named branches
in the repository. Now it tries to do the right thing(tm) in all situations.
author | Sune Foldager <cryo@cyanite.org> |
---|---|
date | Mon, 08 Sep 2008 12:55:46 +0200 |
parents | 4b0c9c674707 |
children | af5f099d932b |
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 | |
5610
2493a478f395
copy: handle rename internally
Matt Mackall <mpm@selenic.com>
parents:
5567
diff
changeset
|
4 moving a/a to b/a |
2493a478f395
copy: handle rename internally
Matt Mackall <mpm@selenic.com>
parents:
5567
diff
changeset
|
5 moving a/b to b/b |
3735 | 6 2 files updated, 0 files merged, 2 files removed, 0 files unresolved |
6336
4b0c9c674707
warn about new heads on commit (issue842)
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
5610
diff
changeset
|
7 created new head |
3735 | 8 resolving manifests |
9 overwrite None partial False | |
10 ancestor f9b20c0d4c51 local ce36d17b18fb+ remote 55119e611c80 | |
5371
17ed9b9a0d03
merge: add debug diagnostics for findcopies
Matt Mackall <mpm@selenic.com>
parents:
5229
diff
changeset
|
11 searching for copies back to rev 1 |
17ed9b9a0d03
merge: add debug diagnostics for findcopies
Matt Mackall <mpm@selenic.com>
parents:
5229
diff
changeset
|
12 unmatched files in local: |
17ed9b9a0d03
merge: add debug diagnostics for findcopies
Matt Mackall <mpm@selenic.com>
parents:
5229
diff
changeset
|
13 a/c |
5567
56e9f7b2d8fa
rename: add test for moving untracked files in directories
Matt Mackall <mpm@selenic.com>
parents:
5371
diff
changeset
|
14 a/d |
5371
17ed9b9a0d03
merge: add debug diagnostics for findcopies
Matt Mackall <mpm@selenic.com>
parents:
5229
diff
changeset
|
15 unmatched files in other: |
17ed9b9a0d03
merge: add debug diagnostics for findcopies
Matt Mackall <mpm@selenic.com>
parents:
5229
diff
changeset
|
16 b/a |
17ed9b9a0d03
merge: add debug diagnostics for findcopies
Matt Mackall <mpm@selenic.com>
parents:
5229
diff
changeset
|
17 b/b |
17ed9b9a0d03
merge: add debug diagnostics for findcopies
Matt Mackall <mpm@selenic.com>
parents:
5229
diff
changeset
|
18 all copies found (* = to merge, ! = divergent): |
17ed9b9a0d03
merge: add debug diagnostics for findcopies
Matt Mackall <mpm@selenic.com>
parents:
5229
diff
changeset
|
19 b/a -> a/a |
17ed9b9a0d03
merge: add debug diagnostics for findcopies
Matt Mackall <mpm@selenic.com>
parents:
5229
diff
changeset
|
20 b/b -> a/b |
17ed9b9a0d03
merge: add debug diagnostics for findcopies
Matt Mackall <mpm@selenic.com>
parents:
5229
diff
changeset
|
21 checking for directory renames |
17ed9b9a0d03
merge: add debug diagnostics for findcopies
Matt Mackall <mpm@selenic.com>
parents:
5229
diff
changeset
|
22 dir a/ -> b/ |
17ed9b9a0d03
merge: add debug diagnostics for findcopies
Matt Mackall <mpm@selenic.com>
parents:
5229
diff
changeset
|
23 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
|
24 file a/d -> b/d |
56e9f7b2d8fa
rename: add test for moving untracked files in directories
Matt Mackall <mpm@selenic.com>
parents:
5371
diff
changeset
|
25 a/d: remote renamed directory to b/d -> d |
3735 | 26 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
|
27 a/b: other deleted -> r |
bb1800a7d7e1
merge: fix spurious merges for copies in linear updates
Matt Mackall <mpm@selenic.com>
parents:
4304
diff
changeset
|
28 a/a: other deleted -> r |
bb1800a7d7e1
merge: fix spurious merges for copies in linear updates
Matt Mackall <mpm@selenic.com>
parents:
4304
diff
changeset
|
29 b/a: remote created -> g |
bb1800a7d7e1
merge: fix spurious merges for copies in linear updates
Matt Mackall <mpm@selenic.com>
parents:
4304
diff
changeset
|
30 b/b: remote created -> g |
3735 | 31 removing a/a |
32 removing a/b | |
33 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
|
34 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
|
35 getting b/a |
bb1800a7d7e1
merge: fix spurious merges for copies in linear updates
Matt Mackall <mpm@selenic.com>
parents:
4304
diff
changeset
|
36 getting b/b |
5567
56e9f7b2d8fa
rename: add test for moving untracked files in directories
Matt Mackall <mpm@selenic.com>
parents:
5371
diff
changeset
|
37 4 files updated, 0 files merged, 2 files removed, 0 files unresolved |
3735 | 38 (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
|
39 a/* b/a b/b b/c b/d |
3735 | 40 M b/a |
41 M b/b | |
42 A b/c | |
43 a/c | |
44 R a/a | |
45 R a/b | |
46 R a/c | |
5567
56e9f7b2d8fa
rename: add test for moving untracked files in directories
Matt Mackall <mpm@selenic.com>
parents:
5371
diff
changeset
|
47 ? 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
|
48 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
|
49 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
3735 | 50 resolving manifests |
51 overwrite None partial False | |
52 ancestor f9b20c0d4c51 local 55119e611c80+ remote ce36d17b18fb | |
5371
17ed9b9a0d03
merge: add debug diagnostics for findcopies
Matt Mackall <mpm@selenic.com>
parents:
5229
diff
changeset
|
53 searching for copies back to rev 1 |
17ed9b9a0d03
merge: add debug diagnostics for findcopies
Matt Mackall <mpm@selenic.com>
parents:
5229
diff
changeset
|
54 unmatched files in local: |
17ed9b9a0d03
merge: add debug diagnostics for findcopies
Matt Mackall <mpm@selenic.com>
parents:
5229
diff
changeset
|
55 b/a |
17ed9b9a0d03
merge: add debug diagnostics for findcopies
Matt Mackall <mpm@selenic.com>
parents:
5229
diff
changeset
|
56 b/b |
5567
56e9f7b2d8fa
rename: add test for moving untracked files in directories
Matt Mackall <mpm@selenic.com>
parents:
5371
diff
changeset
|
57 b/d |
5371
17ed9b9a0d03
merge: add debug diagnostics for findcopies
Matt Mackall <mpm@selenic.com>
parents:
5229
diff
changeset
|
58 unmatched files in other: |
17ed9b9a0d03
merge: add debug diagnostics for findcopies
Matt Mackall <mpm@selenic.com>
parents:
5229
diff
changeset
|
59 a/c |
17ed9b9a0d03
merge: add debug diagnostics for findcopies
Matt Mackall <mpm@selenic.com>
parents:
5229
diff
changeset
|
60 all copies found (* = to merge, ! = divergent): |
17ed9b9a0d03
merge: add debug diagnostics for findcopies
Matt Mackall <mpm@selenic.com>
parents:
5229
diff
changeset
|
61 b/a -> a/a |
17ed9b9a0d03
merge: add debug diagnostics for findcopies
Matt Mackall <mpm@selenic.com>
parents:
5229
diff
changeset
|
62 b/b -> a/b |
17ed9b9a0d03
merge: add debug diagnostics for findcopies
Matt Mackall <mpm@selenic.com>
parents:
5229
diff
changeset
|
63 checking for directory renames |
17ed9b9a0d03
merge: add debug diagnostics for findcopies
Matt Mackall <mpm@selenic.com>
parents:
5229
diff
changeset
|
64 dir a/ -> b/ |
17ed9b9a0d03
merge: add debug diagnostics for findcopies
Matt Mackall <mpm@selenic.com>
parents:
5229
diff
changeset
|
65 file a/c -> b/c |
3735 | 66 None: local renamed directory to b/c -> d |
67 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
|
68 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
3735 | 69 (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
|
70 a/* b/a b/b b/c b/d |
3735 | 71 A b/c |
72 a/c | |
5567
56e9f7b2d8fa
rename: add test for moving untracked files in directories
Matt Mackall <mpm@selenic.com>
parents:
5371
diff
changeset
|
73 ? b/d |
6336
4b0c9c674707
warn about new heads on commit (issue842)
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
5610
diff
changeset
|
74 created new head |
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 |