Mercurial > hg > mercurial-crew-with-dirclash
comparison tests/test-rename-dir-merge.out @ 3735:205f0fd4a4a1
Add missing test output
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Thu, 30 Nov 2006 19:50:28 -0600 |
parents | |
children | 7b88bd88f040 |
comparison
equal
deleted
inserted
replaced
3734:216e75c721d3 | 3735:205f0fd4a4a1 |
---|---|
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) | |
24 ls: a/: No such file or directory | |
25 b/: | |
26 a | |
27 b | |
28 c | |
29 M b/a | |
30 M b/b | |
31 A b/c | |
32 a/c | |
33 R a/a | |
34 R a/b | |
35 R a/c | |
36 0 files updated, 0 files merged, 1 files removed, 0 files unresolved | |
37 resolving manifests | |
38 overwrite None partial False | |
39 ancestor f9b20c0d4c51 local 55119e611c80+ remote ce36d17b18fb | |
40 None: local renamed directory to b/c -> d | |
41 getting a/c to b/c | |
42 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
43 (branch merge, don't forget to commit) | |
44 ls: a/: No such file or directory | |
45 b/: | |
46 a | |
47 b | |
48 c | |
49 A b/c | |
50 a/c |