Mercurial > hg

comparison tests/test-rename-dir-merge.out @ 5567:56e9f7b2d8fa

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
rename: add test for moving untracked files in directories
author Matt Mackall <mpm@selenic.com>
date Sat, 01 Dec 2007 12:54:34 -0600
parents 17ed9b9a0d03
children 2493a478f395
comparison
equal deleted inserted replaced
5566:d74fc8dec2b4 5567:56e9f7b2d8fa
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 searching for copies back to rev 1 12 searching for copies back to rev 1
13 unmatched files in local: 13 unmatched files in local:
14 a/c 14 a/c
15 a/d
15 unmatched files in other: 16 unmatched files in other:
16 b/a 17 b/a
17 b/b 18 b/b
18 all copies found (* = to merge, ! = divergent): 19 all copies found (* = to merge, ! = divergent):
19 b/a -> a/a 20 b/a -> a/a
20 b/b -> a/b 21 b/b -> a/b
21 checking for directory renames 22 checking for directory renames
22 dir a/ -> b/ 23 dir a/ -> b/
23 file a/c -> b/c 24 file a/c -> b/c
25 file a/d -> b/d
26 a/d: remote renamed directory to b/d -> d
24 a/c: remote renamed directory to b/c -> d 27 a/c: remote renamed directory to b/c -> d
25 a/b: other deleted -> r 28 a/b: other deleted -> r
26 a/a: other deleted -> r 29 a/a: other deleted -> r
27 b/a: remote created -> g 30 b/a: remote created -> g
28 b/b: remote created -> g 31 b/b: remote created -> g
29 removing a/a 32 removing a/a
30 removing a/b 33 removing a/b
31 moving a/c to b/c 34 moving a/c to b/c
35 moving a/d to b/d
32 getting b/a 36 getting b/a
33 getting b/b 37 getting b/b
34 3 files updated, 0 files merged, 2 files removed, 0 files unresolved 38 4 files updated, 0 files merged, 2 files removed, 0 files unresolved
35 (branch merge, don't forget to commit) 39 (branch merge, don't forget to commit)
36 a/* b/a b/b b/c 40 a/* b/a b/b b/c b/d
37 M b/a 41 M b/a
38 M b/b 42 M b/b
39 A b/c 43 A b/c
40 a/c 44 a/c
41 R a/a 45 R a/a
42 R a/b 46 R a/b
43 R a/c 47 R a/c
48 ? b/d
44 b/c renamed from a/c:354ae8da6e890359ef49ade27b68bbc361f3ca88 49 b/c renamed from a/c:354ae8da6e890359ef49ade27b68bbc361f3ca88
45 0 files updated, 0 files merged, 1 files removed, 0 files unresolved 50 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
46 resolving manifests 51 resolving manifests
47 overwrite None partial False 52 overwrite None partial False
48 ancestor f9b20c0d4c51 local 55119e611c80+ remote ce36d17b18fb 53 ancestor f9b20c0d4c51 local 55119e611c80+ remote ce36d17b18fb
49 searching for copies back to rev 1 54 searching for copies back to rev 1
50 unmatched files in local: 55 unmatched files in local:
51 b/a 56 b/a
52 b/b 57 b/b
58 b/d
53 unmatched files in other: 59 unmatched files in other:
54 a/c 60 a/c
55 all copies found (* = to merge, ! = divergent): 61 all copies found (* = to merge, ! = divergent):
56 b/a -> a/a 62 b/a -> a/a
57 b/b -> a/b 63 b/b -> a/b
60 file a/c -> b/c 66 file a/c -> b/c
61 None: local renamed directory to b/c -> d 67 None: local renamed directory to b/c -> d
62 getting a/c to b/c 68 getting a/c to b/c
63 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 69 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
64 (branch merge, don't forget to commit) 70 (branch merge, don't forget to commit)
65 a/* b/a b/b b/c 71 a/* b/a b/b b/c b/d
66 A b/c 72 A b/c
67 a/c 73 a/c
74 ? b/d
68 b/c renamed from a/c:354ae8da6e890359ef49ade27b68bbc361f3ca88 75 b/c renamed from a/c:354ae8da6e890359ef49ade27b68bbc361f3ca88