Mercurial > hg > mercurial-crew-with-dirclash
annotate tests/test-rename-dir-merge.out @ 5278:70e9a527cc61
convert: avoid dirstate checks; add a test
During a conversion, the dirstate contents are not consistent - there
are files that may be missing from the dirstate and there may be files
that shouldn't be in the dirstate.
While this is not fixed, don't mark files as added - put them directly
in state 'n'ormal.
author | Alexis S. L. Carvalho <alexis@cecm.usp.br> |
---|---|
date | Sat, 01 Sep 2007 02:49:18 -0300 |
parents | dee573ba79f1 |
children | 17ed9b9a0d03 |
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 | |
12 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
|
13 a/b: other deleted -> r |
bb1800a7d7e1
merge: fix spurious merges for copies in linear updates
Matt Mackall <mpm@selenic.com>
parents:
4311
diff
changeset
|
14 a/a: other deleted -> r |
bb1800a7d7e1
merge: fix spurious merges for copies in linear updates
Matt Mackall <mpm@selenic.com>
parents:
4311
diff
changeset
|
15 b/a: remote created -> g |
bb1800a7d7e1
merge: fix spurious merges for copies in linear updates
Matt Mackall <mpm@selenic.com>
parents:
4311
diff
changeset
|
16 b/b: remote created -> g |
3735 | 17 removing a/a |
18 removing a/b | |
19 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
|
20 getting b/a |
bb1800a7d7e1
merge: fix spurious merges for copies in linear updates
Matt Mackall <mpm@selenic.com>
parents:
4311
diff
changeset
|
21 getting b/b |
bb1800a7d7e1
merge: fix spurious merges for copies in linear updates
Matt Mackall <mpm@selenic.com>
parents:
4311
diff
changeset
|
22 3 files updated, 0 files merged, 2 files removed, 0 files unresolved |
3735 | 23 (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
|
24 a/* b/a b/b b/c |
3735 | 25 M b/a |
26 M b/b | |
27 A b/c | |
28 a/c | |
29 R a/a | |
30 R a/b | |
31 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
|
32 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
|
33 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
3735 | 34 resolving manifests |
35 overwrite None partial False | |
36 ancestor f9b20c0d4c51 local 55119e611c80+ remote ce36d17b18fb | |
37 None: local renamed directory to b/c -> d | |
38 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
|
39 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
3735 | 40 (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
|
41 a/* b/a b/b b/c |
3735 | 42 A b/c |
43 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 |