|
1 |
|
2 $ . "$TESTDIR/narrow-library.sh" |
|
3 |
|
4 create full repo |
|
5 |
|
6 $ hg init master |
|
7 $ cd master |
|
8 $ cat >> .hg/hgrc <<EOF |
|
9 > [narrow] |
|
10 > serveellipses=True |
|
11 > EOF |
|
12 |
|
13 $ mkdir inside |
|
14 $ echo 1 > inside/f |
|
15 $ hg commit -Aqm 'initial inside' |
|
16 |
|
17 $ mkdir outside |
|
18 $ echo 1 > outside/f |
|
19 $ hg commit -Aqm 'initial outside' |
|
20 |
|
21 $ echo 2a > outside/f |
|
22 $ hg commit -Aqm 'outside 2a' |
|
23 $ echo 3 > inside/f |
|
24 $ hg commit -Aqm 'inside 3' |
|
25 $ echo 4a > outside/f |
|
26 $ hg commit -Aqm 'outside 4a' |
|
27 $ hg update '.~3' |
|
28 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
29 |
|
30 $ echo 2b > outside/f |
|
31 $ hg commit -Aqm 'outside 2b' |
|
32 $ echo 3 > inside/f |
|
33 $ hg commit -Aqm 'inside 3' |
|
34 $ echo 4b > outside/f |
|
35 $ hg commit -Aqm 'outside 4b' |
|
36 $ hg update '.~3' |
|
37 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
38 |
|
39 $ echo 2c > outside/f |
|
40 $ hg commit -Aqm 'outside 2c' |
|
41 $ echo 3 > inside/f |
|
42 $ hg commit -Aqm 'inside 3' |
|
43 $ echo 4c > outside/f |
|
44 $ hg commit -Aqm 'outside 4c' |
|
45 $ hg update '.~3' |
|
46 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
47 |
|
48 $ echo 2d > outside/f |
|
49 $ hg commit -Aqm 'outside 2d' |
|
50 $ echo 3 > inside/f |
|
51 $ hg commit -Aqm 'inside 3' |
|
52 $ echo 4d > outside/f |
|
53 $ hg commit -Aqm 'outside 4d' |
|
54 |
|
55 $ hg update -r 'desc("outside 4a")' |
|
56 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
57 $ hg merge -r 'desc("outside 4b")' 2>&1 | egrep -v '(warning:|incomplete!)' |
|
58 merging outside/f |
|
59 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
|
60 use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon |
|
61 $ echo 5 > outside/f |
|
62 $ rm outside/f.orig |
|
63 $ hg resolve --mark outside/f |
|
64 (no more unresolved files) |
|
65 $ hg commit -m 'merge a/b 5' |
|
66 $ echo 6 > outside/f |
|
67 $ hg commit -Aqm 'outside 6' |
|
68 |
|
69 $ hg merge -r 'desc("outside 4c")' 2>&1 | egrep -v '(warning:|incomplete!)' |
|
70 merging outside/f |
|
71 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
|
72 use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon |
|
73 $ echo 7 > outside/f |
|
74 $ rm outside/f.orig |
|
75 $ hg resolve --mark outside/f |
|
76 (no more unresolved files) |
|
77 $ hg commit -Aqm 'merge a/b/c 7' |
|
78 $ echo 8 > outside/f |
|
79 $ hg commit -Aqm 'outside 8' |
|
80 |
|
81 $ hg merge -r 'desc("outside 4d")' 2>&1 | egrep -v '(warning:|incomplete!)' |
|
82 merging outside/f |
|
83 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
|
84 use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon |
|
85 $ echo 9 > outside/f |
|
86 $ rm outside/f.orig |
|
87 $ hg resolve --mark outside/f |
|
88 (no more unresolved files) |
|
89 $ hg commit -Aqm 'merge a/b/c/d 9' |
|
90 $ echo 10 > outside/f |
|
91 $ hg commit -Aqm 'outside 10' |
|
92 |
|
93 $ echo 11 > inside/f |
|
94 $ hg commit -Aqm 'inside 11' |
|
95 $ echo 12 > outside/f |
|
96 $ hg commit -Aqm 'outside 12' |
|
97 |
|
98 $ hg log -G -T '{rev} {node|short} {desc}\n' |
|
99 @ 21 8d874d57adea outside 12 |
|
100 | |
|
101 o 20 7ef88b4dd4fa inside 11 |
|
102 | |
|
103 o 19 2a20009de83e outside 10 |
|
104 | |
|
105 o 18 3ac1f5779de3 merge a/b/c/d 9 |
|
106 |\ |
|
107 | o 17 38a9c2f7e546 outside 8 |
|
108 | | |
|
109 | o 16 094aa62fc898 merge a/b/c 7 |
|
110 | |\ |
|
111 | | o 15 f29d083d32e4 outside 6 |
|
112 | | | |
|
113 | | o 14 2dc11382541d merge a/b 5 |
|
114 | | |\ |
|
115 o | | | 13 27d07ef97221 outside 4d |
|
116 | | | | |
|
117 o | | | 12 465567bdfb2d inside 3 |
|
118 | | | | |
|
119 o | | | 11 d1c61993ec83 outside 2d |
|
120 | | | | |
|
121 | o | | 10 56859a8e33b9 outside 4c |
|
122 | | | | |
|
123 | o | | 9 bb96a08b062a inside 3 |
|
124 | | | | |
|
125 | o | | 8 b844052e7b3b outside 2c |
|
126 |/ / / |
|
127 | | o 7 9db2d8fcc2a6 outside 4b |
|
128 | | | |
|
129 | | o 6 6418167787a6 inside 3 |
|
130 | | | |
|
131 +---o 5 77344f344d83 outside 2b |
|
132 | | |
|
133 | o 4 9cadde08dc9f outside 4a |
|
134 | | |
|
135 | o 3 019ef06f125b inside 3 |
|
136 | | |
|
137 | o 2 75e40c075a19 outside 2a |
|
138 |/ |
|
139 o 1 906d6c682641 initial outside |
|
140 | |
|
141 o 0 9f8e82b51004 initial inside |
|
142 |
|
143 |
|
144 Now narrow clone this and get a hopefully correct graph |
|
145 |
|
146 $ cd .. |
|
147 $ hg clone --narrow ssh://user@dummy/master narrow --include inside |
|
148 requesting all changes |
|
149 adding changesets |
|
150 adding manifests |
|
151 adding file changes |
|
152 added 14 changesets with 3 changes to 1 files |
|
153 new changesets *:* (glob) |
|
154 updating to branch default |
|
155 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
156 $ cd narrow |
|
157 |
|
158 To make updating the tests easier, we print the emitted nodes |
|
159 sorted. This makes it easier to identify when the same node structure |
|
160 has been emitted, just in a different order. |
|
161 |
|
162 $ hg log -T '{if(ellipsis,"...")}{node|short} {p1node|short} {p2node|short} {desc}\n' | sort |
|
163 ...094aa62fc898 6418167787a6 bb96a08b062a merge a/b/c 7 |
|
164 ...2a20009de83e 019ef06f125b 3ac1f5779de3 outside 10 |
|
165 ...3ac1f5779de3 465567bdfb2d 094aa62fc898 merge a/b/c/d 9 |
|
166 ...75e40c075a19 9f8e82b51004 000000000000 outside 2a |
|
167 ...77344f344d83 9f8e82b51004 000000000000 outside 2b |
|
168 ...8d874d57adea 7ef88b4dd4fa 000000000000 outside 12 |
|
169 ...b844052e7b3b 9f8e82b51004 000000000000 outside 2c |
|
170 ...d1c61993ec83 9f8e82b51004 000000000000 outside 2d |
|
171 019ef06f125b 75e40c075a19 000000000000 inside 3 |
|
172 465567bdfb2d d1c61993ec83 000000000000 inside 3 |
|
173 6418167787a6 77344f344d83 000000000000 inside 3 |
|
174 7ef88b4dd4fa 2a20009de83e 000000000000 inside 11 |
|
175 9f8e82b51004 000000000000 000000000000 initial inside |
|
176 bb96a08b062a b844052e7b3b 000000000000 inside 3 |
|
177 |
|
178 But seeing the graph is also nice: |
|
179 $ hg log -G -T '{if(ellipsis,"...")}{node|short} {desc}\n' |
|
180 @ ...8d874d57adea outside 12 |
|
181 | |
|
182 o 7ef88b4dd4fa inside 11 |
|
183 | |
|
184 o ...2a20009de83e outside 10 |
|
185 |\ |
|
186 | o ...3ac1f5779de3 merge a/b/c/d 9 |
|
187 | |\ |
|
188 | | o ...094aa62fc898 merge a/b/c 7 |
|
189 | | |\ |
|
190 | o | | 465567bdfb2d inside 3 |
|
191 | | | | |
|
192 | o | | ...d1c61993ec83 outside 2d |
|
193 | | | | |
|
194 | | | o bb96a08b062a inside 3 |
|
195 | | | | |
|
196 | +---o ...b844052e7b3b outside 2c |
|
197 | | | |
|
198 | | o 6418167787a6 inside 3 |
|
199 | | | |
|
200 | | o ...77344f344d83 outside 2b |
|
201 | |/ |
|
202 o | 019ef06f125b inside 3 |
|
203 | | |
|
204 o | ...75e40c075a19 outside 2a |
|
205 |/ |
|
206 o 9f8e82b51004 initial inside |
|
207 |