Show More
@@ -1,33 +1,115 b'' | |||||
1 | #!/bin/sh |
|
1 | $ mkdir t | |
|
2 | $ cd t | |||
|
3 | $ hg init | |||
2 |
|
4 | |||
3 |
mkdir |
|
5 | $ mkdir a | |
4 | cd t |
|
6 | $ echo foo > a/a | |
5 | hg init |
|
7 | $ echo bar > a/b | |
|
8 | $ hg ci -Am "0" | |||
|
9 | adding a/a | |||
|
10 | adding a/b | |||
6 |
|
11 | |||
7 | mkdir a |
|
12 | $ hg co -C 0 | |
8 | echo foo > a/a |
|
13 | 0 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
9 | echo bar > a/b |
|
14 | $ hg mv a b | |
10 | hg ci -Am "0" |
|
15 | moving a/a to b/a | |
|
16 | moving a/b to b/b | |||
|
17 | $ hg ci -m "1 mv a/ b/" | |||
11 |
|
18 | |||
12 | hg co -C 0 |
|
19 | $ hg co -C 0 | |
13 | hg mv a b |
|
20 | 2 files updated, 0 files merged, 2 files removed, 0 files unresolved | |
14 | hg ci -m "1 mv a/ b/" |
|
21 | $ echo baz > a/c | |
|
22 | $ echo quux > a/d | |||
|
23 | $ hg add a/c | |||
|
24 | $ hg ci -m "2 add a/c" | |||
|
25 | created new head | |||
15 |
|
26 | |||
16 | hg co -C 0 |
|
27 | $ hg merge --debug 1 | |
17 | echo baz > a/c |
|
28 | searching for copies back to rev 1 | |
18 | echo quux > a/d |
|
29 | unmatched files in local: | |
19 | hg add a/c |
|
30 | a/c | |
20 | hg ci -m "2 add a/c" |
|
31 | a/d | |
|
32 | unmatched files in other: | |||
|
33 | b/a | |||
|
34 | b/b | |||
|
35 | all copies found (* = to merge, ! = divergent): | |||
|
36 | b/a -> a/a | |||
|
37 | b/b -> a/b | |||
|
38 | checking for directory renames | |||
|
39 | dir a/ -> b/ | |||
|
40 | file a/c -> b/c | |||
|
41 | file a/d -> b/d | |||
|
42 | resolving manifests | |||
|
43 | overwrite None partial False | |||
|
44 | ancestor f9b20c0d4c51 local ce36d17b18fb+ remote 397f8b00a740 | |||
|
45 | a/d: remote renamed directory to b/d -> d | |||
|
46 | a/c: remote renamed directory to b/c -> d | |||
|
47 | a/b: other deleted -> r | |||
|
48 | a/a: other deleted -> r | |||
|
49 | b/a: remote created -> g | |||
|
50 | b/b: remote created -> g | |||
|
51 | updating: a/a 1/6 files (16.67%) | |||
|
52 | removing a/a | |||
|
53 | updating: a/b 2/6 files (33.33%) | |||
|
54 | removing a/b | |||
|
55 | updating: a/c 3/6 files (50.00%) | |||
|
56 | moving a/c to b/c | |||
|
57 | updating: a/d 4/6 files (66.67%) | |||
|
58 | moving a/d to b/d | |||
|
59 | updating: b/a 5/6 files (83.33%) | |||
|
60 | getting b/a | |||
|
61 | updating: b/b 6/6 files (100.00%) | |||
|
62 | getting b/b | |||
|
63 | 4 files updated, 0 files merged, 2 files removed, 0 files unresolved | |||
|
64 | (branch merge, don't forget to commit) | |||
21 |
|
65 | |||
22 | hg merge --debug 1 |
|
66 | $ echo a/* b/* | |
23 | echo a/* b/* |
|
67 | a/* b/a b/b b/c b/d | |
24 | hg st -C |
|
68 | $ hg st -C | |
25 | hg ci -m "3 merge 2+1" |
|
69 | M b/a | |
26 | hg debugrename b/c |
|
70 | M b/b | |
|
71 | A b/c | |||
|
72 | a/c | |||
|
73 | R a/a | |||
|
74 | R a/b | |||
|
75 | R a/c | |||
|
76 | ? b/d | |||
|
77 | $ hg ci -m "3 merge 2+1" | |||
|
78 | $ hg debugrename b/c | |||
|
79 | b/c renamed from a/c:354ae8da6e890359ef49ade27b68bbc361f3ca88 | |||
27 |
|
80 | |||
28 | hg co -C 1 |
|
81 | $ hg co -C 1 | |
29 | hg merge --debug 2 |
|
82 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved | |
30 | echo a/* b/* |
|
83 | $ hg merge --debug 2 | |
31 | hg st -C |
|
84 | searching for copies back to rev 1 | |
32 | hg ci -m "4 merge 1+2" |
|
85 | unmatched files in local: | |
33 | hg debugrename b/c |
|
86 | b/a | |
|
87 | b/b | |||
|
88 | b/d | |||
|
89 | unmatched files in other: | |||
|
90 | a/c | |||
|
91 | all copies found (* = to merge, ! = divergent): | |||
|
92 | b/a -> a/a | |||
|
93 | b/b -> a/b | |||
|
94 | checking for directory renames | |||
|
95 | dir a/ -> b/ | |||
|
96 | file a/c -> b/c | |||
|
97 | resolving manifests | |||
|
98 | overwrite None partial False | |||
|
99 | ancestor f9b20c0d4c51 local 397f8b00a740+ remote ce36d17b18fb | |||
|
100 | None: local renamed directory to b/c -> d | |||
|
101 | updating:None 1/1 files (100.00%) | |||
|
102 | getting a/c to b/c | |||
|
103 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |||
|
104 | (branch merge, don't forget to commit) | |||
|
105 | ||||
|
106 | $ echo a/* b/* | |||
|
107 | a/* b/a b/b b/c b/d | |||
|
108 | $ hg st -C | |||
|
109 | A b/c | |||
|
110 | a/c | |||
|
111 | ? b/d | |||
|
112 | $ hg ci -m "4 merge 1+2" | |||
|
113 | created new head | |||
|
114 | $ hg debugrename b/c | |||
|
115 | b/c renamed from a/c:354ae8da6e890359ef49ade27b68bbc361f3ca88 |
1 | NO CONTENT: file was removed |
|
NO CONTENT: file was removed |
General Comments 0
You need to be logged in to leave comments.
Login now