Mercurial > hg > mercurial-crew-with-dirclash
annotate tests/test-rename-dir-merge.out @ 3755:05120e210c65
Use unsigned version format.
This way can use one additional bit, and when encountering invalid revlogs
with the first bit set don't produce python warnings or strange error messages.
author | Thomas Arendsen Hein <thomas@intevation.de> |
---|---|
date | Fri, 01 Dec 2006 23:27:53 +0100 |
parents | 7b88bd88f040 |
children | 4787e2b0dd03 |
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 | |
13 a/b: other deleted -> r | |
14 a/a: other deleted -> r | |
15 b/a: remote created -> g | |
16 b/b: remote created -> g | |
17 removing a/a | |
18 removing a/b | |
19 moving a/c to b/c | |
20 getting b/a | |
21 getting b/b | |
22 3 files updated, 0 files merged, 2 files removed, 0 files unresolved | |
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 | |
32 0 files updated, 0 files merged, 1 files removed, 0 files unresolved | |
33 resolving manifests | |
34 overwrite None partial False | |
35 ancestor f9b20c0d4c51 local 55119e611c80+ remote ce36d17b18fb | |
36 None: local renamed directory to b/c -> d | |
37 getting a/c to b/c | |
38 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
39 (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
|
40 a/* b/a b/b b/c |
3735 | 41 A b/c |
42 a/c |