Mercurial > hg > mercurial-crew-with-dirclash

comparison tests/test-rename-dir-merge.out @ 4311:4787e2b0dd03

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge: fix a bug where copies were ignored
author Matt Mackall <mpm@selenic.com>
date Thu, 05 Apr 2007 16:43:18 -0500
parents 7b88bd88f040
children bb1800a7d7e1
comparison
equal deleted inserted replaced
4273:8185a1ca8628 4311:4787e2b0dd03
8 2 files updated, 0 files merged, 2 files removed, 0 files unresolved 8 2 files updated, 0 files merged, 2 files removed, 0 files unresolved
9 resolving manifests 9 resolving manifests
10 overwrite None partial False 10 overwrite None partial False
11 ancestor f9b20c0d4c51 local ce36d17b18fb+ remote 55119e611c80 11 ancestor f9b20c0d4c51 local ce36d17b18fb+ remote 55119e611c80
12 a/c: remote renamed directory to b/c -> d 12 a/c: remote renamed directory to b/c -> d
13 a/b: other deleted -> r 13 a/a: remote moved to b/a -> m
14 a/a: other deleted -> r 14 a/b: remote moved to b/b -> m
15 b/a: remote created -> g 15 copying a/a to b/a
16 b/b: remote created -> g
17 removing a/a 16 removing a/a
17 copying a/b to b/b
18 removing a/b 18 removing a/b
19 moving a/c to b/c 19 moving a/c to b/c
20 getting b/a 20 3 files updated, 0 files merged, 0 files removed, 0 files unresolved
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) 21 (branch merge, don't forget to commit)
24 a/* b/a b/b b/c 22 a/* b/a b/b b/c
25 M b/a 23 M b/a
24 a/a
26 M b/b 25 M b/b
26 a/b
27 A b/c 27 A b/c
28 a/c 28 a/c
29 R a/a 29 R a/a
30 R a/b 30 R a/b
31 R a/c 31 R a/c
32 0 files updated, 0 files merged, 1 files removed, 0 files unresolved 32 2 files updated, 0 files merged, 1 files removed, 0 files unresolved
33 resolving manifests 33 resolving manifests
34 overwrite None partial False 34 overwrite None partial False
35 ancestor f9b20c0d4c51 local 55119e611c80+ remote ce36d17b18fb 35 ancestor f9b20c0d4c51 local 55119e611c80+ remote ce36d17b18fb
36 b/a: local moved to a/a -> m
37 b/b: local moved to a/b -> m
36 None: local renamed directory to b/c -> d 38 None: local renamed directory to b/c -> d
37 getting a/c to b/c 39 getting a/c to b/c
38 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 40 3 files updated, 0 files merged, 0 files removed, 0 files unresolved
39 (branch merge, don't forget to commit) 41 (branch merge, don't forget to commit)
40 a/* b/a b/b b/c 42 a/* b/a b/b b/c
43 M b/a
44 a/a
45 M b/b
46 a/b
41 A b/c 47 A b/c
42 a/c 48 a/c