Mercurial > hg

comparison tests/test-rename-merge2.out @ 3331:f472cf9a71af

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge with crew
author Benoit Boissinot <benoit.boissinot@ens-lyon.org>
date Wed, 11 Oct 2006 16:41:52 +0200
parents b16456909a0a
children d2b55e3c4e25
comparison
equal deleted inserted replaced
3330:49966b5ab16f 3331:f472cf9a71af
1 -------------- 1 --------------
2 test L:up a R:nc a b W: - 1 get local a to b 2 test L:up a R:nc a b W: - 1 get local a to b
3 -------------- 3 --------------
4 resolving manifests 4 resolving manifests
5 overwrite None branchmerge True partial False 5 overwrite None partial False
6 ancestor e300d1c794ec local 735846fee2d7 remote 924404dff337 6 ancestor 924404dff337 local e300d1c794ec+ remote 735846fee2d7
7 rev: versions differ -> m 7 rev: versions differ -> m
8 a: remote copied -> c 8 a: remote copied -> m
9 merging a and b to b 9 merging a and b
10 resolving a 10 my a@e300d1c794ec+ other b@735846fee2d7 ancestor a@924404dff337
11 my a@e300d1c794ec other b@735846fee2d7 ancestor a@924404dff337
12 copying a to b 11 copying a to b
13 merging rev 12 merging rev
14 resolving rev 13 my rev@e300d1c794ec+ other rev@735846fee2d7 ancestor rev@924404dff337
15 my rev@e300d1c794ec other rev@735846fee2d7 ancestor rev@924404dff337
16 0 files updated, 2 files merged, 0 files removed, 0 files unresolved 14 0 files updated, 2 files merged, 0 files removed, 0 files unresolved
17 (branch merge, don't forget to commit) 15 (branch merge, don't forget to commit)
18 -------------- 16 --------------
19 M a 17 M a
20 M b 18 M b
23 21
24 -------------- 22 --------------
25 test L:nc a b R:up a W: - 2 get rem change to a and b 23 test L:nc a b R:up a W: - 2 get rem change to a and b
26 -------------- 24 --------------
27 resolving manifests 25 resolving manifests
28 overwrite None branchmerge True partial False 26 overwrite None partial False
29 ancestor ac809aeed39a local f4db7e329e71 remote 924404dff337 27 ancestor 924404dff337 local ac809aeed39a+ remote f4db7e329e71
30 a: remote is newer -> g 28 a: remote is newer -> g
31 b: local copied -> c 29 b: local copied -> m
32 rev: versions differ -> m 30 rev: versions differ -> m
33 getting a 31 getting a
34 merging b and a to b 32 merging b and a
35 resolving b 33 my b@ac809aeed39a+ other a@f4db7e329e71 ancestor a@924404dff337
36 my b@ac809aeed39a other a@f4db7e329e71 ancestor a@924404dff337 34 merging rev
37 merging rev 35 my rev@ac809aeed39a+ other rev@f4db7e329e71 ancestor rev@924404dff337
38 resolving rev
39 my rev@ac809aeed39a other rev@f4db7e329e71 ancestor rev@924404dff337
40 1 files updated, 2 files merged, 0 files removed, 0 files unresolved 36 1 files updated, 2 files merged, 0 files removed, 0 files unresolved
41 (branch merge, don't forget to commit) 37 (branch merge, don't forget to commit)
42 -------------- 38 --------------
43 M a 39 M a
44 M b 40 M b
47 43
48 -------------- 44 --------------
49 test L:up a R:nm a b W: - 3 get local a change to b, remove a 45 test L:up a R:nm a b W: - 3 get local a change to b, remove a
50 -------------- 46 --------------
51 resolving manifests 47 resolving manifests
52 overwrite None branchmerge True partial False 48 overwrite None partial False
53 ancestor e300d1c794ec local e03727d2d66b remote 924404dff337 49 ancestor 924404dff337 local e300d1c794ec+ remote e03727d2d66b
54 a: remote moved -> c 50 a: remote moved -> m
55 rev: versions differ -> m 51 rev: versions differ -> m
56 merging a and b to b 52 merging a and b
57 resolving a 53 my a@e300d1c794ec+ other b@e03727d2d66b ancestor a@924404dff337
58 my a@e300d1c794ec other b@e03727d2d66b ancestor a@924404dff337
59 copying a to b 54 copying a to b
60 removing a 55 removing a
61 merging rev 56 merging rev
62 resolving rev 57 my rev@e300d1c794ec+ other rev@e03727d2d66b ancestor rev@924404dff337
63 my rev@e300d1c794ec other rev@e03727d2d66b ancestor rev@924404dff337
64 0 files updated, 2 files merged, 0 files removed, 0 files unresolved 58 0 files updated, 2 files merged, 0 files removed, 0 files unresolved
65 (branch merge, don't forget to commit) 59 (branch merge, don't forget to commit)
66 -------------- 60 --------------
67 M b 61 M b
68 a 62 a
70 64
71 -------------- 65 --------------
72 test L:nm a b R:up a W: - 4 get remote change to b 66 test L:nm a b R:up a W: - 4 get remote change to b
73 -------------- 67 --------------
74 resolving manifests 68 resolving manifests
75 overwrite None branchmerge True partial False 69 overwrite None partial False
76 ancestor ecf3cb2a4219 local f4db7e329e71 remote 924404dff337 70 ancestor 924404dff337 local ecf3cb2a4219+ remote f4db7e329e71
77 b: local moved -> c 71 b: local moved -> m
78 rev: versions differ -> m 72 rev: versions differ -> m
79 merging b and a to b 73 merging b and a
80 resolving b 74 my b@ecf3cb2a4219+ other a@f4db7e329e71 ancestor a@924404dff337
81 my b@ecf3cb2a4219 other a@f4db7e329e71 ancestor a@924404dff337 75 merging rev
82 merging rev 76 my rev@ecf3cb2a4219+ other rev@f4db7e329e71 ancestor rev@924404dff337
83 resolving rev
84 my rev@ecf3cb2a4219 other rev@f4db7e329e71 ancestor rev@924404dff337
85 0 files updated, 2 files merged, 0 files removed, 0 files unresolved 77 0 files updated, 2 files merged, 0 files removed, 0 files unresolved
86 (branch merge, don't forget to commit) 78 (branch merge, don't forget to commit)
87 -------------- 79 --------------
88 M b 80 M b
89 a 81 a
91 83
92 -------------- 84 --------------
93 test L: R:nc a b W: - 5 get b 85 test L: R:nc a b W: - 5 get b
94 -------------- 86 --------------
95 resolving manifests 87 resolving manifests
96 overwrite None branchmerge True partial False 88 overwrite None partial False
97 ancestor 94b33a1b7f2d local 735846fee2d7 remote 924404dff337 89 ancestor 924404dff337 local 94b33a1b7f2d+ remote 735846fee2d7
98 rev: versions differ -> m 90 rev: versions differ -> m
99 a: remote copied -> c 91 a: remote copied -> m
100 merging a and b to b
101 resolving a
102 my a@924404dff337 other b@735846fee2d7 ancestor a@924404dff337
103 copying a to b 92 copying a to b
104 merging rev 93 merging rev
105 resolving rev 94 my rev@94b33a1b7f2d+ other rev@735846fee2d7 ancestor rev@924404dff337
106 my rev@94b33a1b7f2d other rev@735846fee2d7 ancestor rev@924404dff337 95 0 files updated, 2 files merged, 0 files removed, 0 files unresolved
107 0 files updated, 2 files merged, 0 files removed, 0 files unresolved 96 (branch merge, don't forget to commit)
108 (branch merge, don't forget to commit) 97 --------------
109 -------------- 98 M b
110 M a 99 a
111 M b 100 C a
112 a
113 -------------- 101 --------------
114 102
115 -------------- 103 --------------
116 test L:nc a b R: W: - 6 nothing 104 test L:nc a b R: W: - 6 nothing
117 -------------- 105 --------------
118 resolving manifests 106 resolving manifests
119 overwrite None branchmerge True partial False 107 overwrite None partial False
120 ancestor ac809aeed39a local 97c705ade336 remote 924404dff337 108 ancestor 924404dff337 local ac809aeed39a+ remote 97c705ade336
121 b: local copied -> c 109 b: local copied -> m
122 rev: versions differ -> m 110 rev: versions differ -> m
123 merging b and a to b 111 merging rev
124 resolving b 112 my rev@ac809aeed39a+ other rev@97c705ade336 ancestor rev@924404dff337
125 my b@ac809aeed39a other a@924404dff337 ancestor a@924404dff337
126 merging rev
127 resolving rev
128 my rev@ac809aeed39a other rev@97c705ade336 ancestor rev@924404dff337
129 0 files updated, 2 files merged, 0 files removed, 0 files unresolved 113 0 files updated, 2 files merged, 0 files removed, 0 files unresolved
130 (branch merge, don't forget to commit) 114 (branch merge, don't forget to commit)
131 -------------- 115 --------------
132 M b 116 M b
133 a 117 a
136 120
137 -------------- 121 --------------
138 test L: R:nm a b W: - 7 get b 122 test L: R:nm a b W: - 7 get b
139 -------------- 123 --------------
140 resolving manifests 124 resolving manifests
141 overwrite None branchmerge True partial False 125 overwrite None partial False
142 ancestor 94b33a1b7f2d local e03727d2d66b remote 924404dff337 126 ancestor 924404dff337 local 94b33a1b7f2d+ remote e03727d2d66b
143 a: remote moved -> c 127 a: remote moved -> m
144 rev: versions differ -> m 128 rev: versions differ -> m
145 merging a and b to b
146 resolving a
147 my a@924404dff337 other b@e03727d2d66b ancestor a@924404dff337
148 copying a to b 129 copying a to b
149 removing a 130 removing a
150 merging rev 131 merging rev
151 resolving rev 132 my rev@94b33a1b7f2d+ other rev@e03727d2d66b ancestor rev@924404dff337
152 my rev@94b33a1b7f2d other rev@e03727d2d66b ancestor rev@924404dff337
153 0 files updated, 2 files merged, 0 files removed, 0 files unresolved 133 0 files updated, 2 files merged, 0 files removed, 0 files unresolved
154 (branch merge, don't forget to commit) 134 (branch merge, don't forget to commit)
155 -------------- 135 --------------
156 M b 136 M b
157 a 137 a
159 139
160 -------------- 140 --------------
161 test L:nm a b R: W: - 8 nothing 141 test L:nm a b R: W: - 8 nothing
162 -------------- 142 --------------
163 resolving manifests 143 resolving manifests
164 overwrite None branchmerge True partial False 144 overwrite None partial False
165 ancestor ecf3cb2a4219 local 97c705ade336 remote 924404dff337 145 ancestor 924404dff337 local ecf3cb2a4219+ remote 97c705ade336
166 b: local moved -> c 146 b: local moved -> m
167 rev: versions differ -> m 147 rev: versions differ -> m
168 merging b and a to b 148 merging rev
169 resolving b 149 my rev@ecf3cb2a4219+ other rev@97c705ade336 ancestor rev@924404dff337
170 my b@ecf3cb2a4219 other a@924404dff337 ancestor a@924404dff337
171 merging rev
172 resolving rev
173 my rev@ecf3cb2a4219 other rev@97c705ade336 ancestor rev@924404dff337
174 0 files updated, 2 files merged, 0 files removed, 0 files unresolved 150 0 files updated, 2 files merged, 0 files removed, 0 files unresolved
175 (branch merge, don't forget to commit) 151 (branch merge, don't forget to commit)
176 -------------- 152 --------------
177 M b 153 M b
178 a 154 a
180 156
181 -------------- 157 --------------
182 test L:um a b R:um a b W: - 9 do merge with ancestor in a 158 test L:um a b R:um a b W: - 9 do merge with ancestor in a
183 -------------- 159 --------------
184 resolving manifests 160 resolving manifests
185 overwrite None branchmerge True partial False 161 overwrite None partial False
186 ancestor ec03c2ca8642 local 79cc6877a3b7 remote 924404dff337 162 ancestor 924404dff337 local ec03c2ca8642+ remote 79cc6877a3b7
187 b: versions differ -> m 163 b: versions differ -> m
188 rev: versions differ -> m 164 rev: versions differ -> m
189 merging b 165 merging b
190 resolving b 166 my b@ec03c2ca8642+ other b@79cc6877a3b7 ancestor a@924404dff337
191 my b@ec03c2ca8642 other b@79cc6877a3b7 ancestor a@924404dff337 167 merging rev
192 merging rev 168 my rev@ec03c2ca8642+ other rev@79cc6877a3b7 ancestor rev@924404dff337
193 resolving rev
194 my rev@ec03c2ca8642 other rev@79cc6877a3b7 ancestor rev@924404dff337
195 0 files updated, 2 files merged, 0 files removed, 0 files unresolved 169 0 files updated, 2 files merged, 0 files removed, 0 files unresolved
196 (branch merge, don't forget to commit) 170 (branch merge, don't forget to commit)
197 -------------- 171 --------------
198 M b 172 M b
199 -------------- 173 --------------
200 174
201 -------------- 175 --------------
202 test L:nm a b R:nm a c W: - 11 get c, keep b 176 test L:nm a b R:nm a c W: - 11 get c, keep b
203 -------------- 177 --------------
204 resolving manifests 178 resolving manifests
205 overwrite None branchmerge True partial False 179 overwrite None partial False
206 ancestor ecf3cb2a4219 local e6abcc1a30c2 remote 924404dff337 180 ancestor 924404dff337 local ecf3cb2a4219+ remote e6abcc1a30c2
207 rev: versions differ -> m 181 rev: versions differ -> m
208 c: remote created -> g 182 c: remote created -> g
209 getting c 183 getting c
210 merging rev 184 merging rev
211 resolving rev 185 my rev@ecf3cb2a4219+ other rev@e6abcc1a30c2 ancestor rev@924404dff337
212 my rev@ecf3cb2a4219 other rev@e6abcc1a30c2 ancestor rev@924404dff337
213 1 files updated, 1 files merged, 0 files removed, 0 files unresolved 186 1 files updated, 1 files merged, 0 files removed, 0 files unresolved
214 (branch merge, don't forget to commit) 187 (branch merge, don't forget to commit)
215 -------------- 188 --------------
216 M c 189 M c
217 C b 190 C b
219 192
220 -------------- 193 --------------
221 test L:nc a b R:up b W: - 12 merge b no ancestor 194 test L:nc a b R:up b W: - 12 merge b no ancestor
222 -------------- 195 --------------
223 resolving manifests 196 resolving manifests
224 overwrite None branchmerge True partial False 197 overwrite None partial False
225 ancestor ac809aeed39a local af30c7647fc7 remote 924404dff337 198 ancestor 924404dff337 local ac809aeed39a+ remote af30c7647fc7
226 b: versions differ -> m 199 b: versions differ -> m
227 rev: versions differ -> m 200 rev: versions differ -> m
228 merging b 201 merging b
229 resolving b 202 my b@ac809aeed39a+ other b@af30c7647fc7 ancestor b@000000000000
230 my b@ac809aeed39a other b@af30c7647fc7 ancestor b@000000000000 203 merging rev
231 merging rev 204 my rev@ac809aeed39a+ other rev@af30c7647fc7 ancestor rev@924404dff337
232 resolving rev
233 my rev@ac809aeed39a other rev@af30c7647fc7 ancestor rev@924404dff337
234 0 files updated, 2 files merged, 0 files removed, 0 files unresolved 205 0 files updated, 2 files merged, 0 files removed, 0 files unresolved
235 (branch merge, don't forget to commit) 206 (branch merge, don't forget to commit)
236 -------------- 207 --------------
237 M b 208 M b
238 C a 209 C a
240 211
241 -------------- 212 --------------
242 test L:up b R:nm a b W: - 13 merge b no ancestor 213 test L:up b R:nm a b W: - 13 merge b no ancestor
243 -------------- 214 --------------
244 resolving manifests 215 resolving manifests
245 overwrite None branchmerge True partial False 216 overwrite None partial False
246 ancestor 59318016310c local e03727d2d66b remote 924404dff337 217 ancestor 924404dff337 local 59318016310c+ remote e03727d2d66b
247 a: other deleted -> r 218 a: other deleted -> r
248 b: versions differ -> m 219 b: versions differ -> m
249 rev: versions differ -> m 220 rev: versions differ -> m
250 removing a 221 removing a
251 merging b 222 merging b
252 resolving b 223 my b@59318016310c+ other b@e03727d2d66b ancestor b@000000000000
253 my b@59318016310c other b@e03727d2d66b ancestor b@000000000000 224 merging rev
254 merging rev 225 my rev@59318016310c+ other rev@e03727d2d66b ancestor rev@924404dff337
255 resolving rev
256 my rev@59318016310c other rev@e03727d2d66b ancestor rev@924404dff337
257 0 files updated, 2 files merged, 1 files removed, 0 files unresolved 226 0 files updated, 2 files merged, 1 files removed, 0 files unresolved
258 (branch merge, don't forget to commit) 227 (branch merge, don't forget to commit)
259 -------------- 228 --------------
260 M b 229 M b
261 -------------- 230 --------------
262 231
263 -------------- 232 --------------
264 test L:nc a b R:up a b W: - 14 merge b no ancestor 233 test L:nc a b R:up a b W: - 14 merge b no ancestor
265 -------------- 234 --------------
266 resolving manifests 235 resolving manifests
267 overwrite None branchmerge True partial False 236 overwrite None partial False
268 ancestor ac809aeed39a local 8dbce441892a remote 924404dff337 237 ancestor 924404dff337 local ac809aeed39a+ remote 8dbce441892a
269 a: remote is newer -> g 238 a: remote is newer -> g
270 b: versions differ -> m 239 b: versions differ -> m
271 rev: versions differ -> m 240 rev: versions differ -> m
272 getting a 241 getting a
273 merging b 242 merging b
274 resolving b 243 my b@ac809aeed39a+ other b@8dbce441892a ancestor b@000000000000
275 my b@ac809aeed39a other b@8dbce441892a ancestor b@000000000000 244 merging rev
276 merging rev 245 my rev@ac809aeed39a+ other rev@8dbce441892a ancestor rev@924404dff337
277 resolving rev
278 my rev@ac809aeed39a other rev@8dbce441892a ancestor rev@924404dff337
279 1 files updated, 2 files merged, 0 files removed, 0 files unresolved 246 1 files updated, 2 files merged, 0 files removed, 0 files unresolved
280 (branch merge, don't forget to commit) 247 (branch merge, don't forget to commit)
281 -------------- 248 --------------
282 M a 249 M a
283 M b 250 M b
285 252
286 -------------- 253 --------------
287 test L:up b R:nm a b W: - 15 merge b no ancestor, remove a 254 test L:up b R:nm a b W: - 15 merge b no ancestor, remove a
288 -------------- 255 --------------
289 resolving manifests 256 resolving manifests
290 overwrite None branchmerge True partial False 257 overwrite None partial False
291 ancestor 59318016310c local e03727d2d66b remote 924404dff337 258 ancestor 924404dff337 local 59318016310c+ remote e03727d2d66b
292 a: other deleted -> r 259 a: other deleted -> r
293 b: versions differ -> m 260 b: versions differ -> m
294 rev: versions differ -> m 261 rev: versions differ -> m
295 removing a 262 removing a
296 merging b 263 merging b
297 resolving b 264 my b@59318016310c+ other b@e03727d2d66b ancestor b@000000000000
298 my b@59318016310c other b@e03727d2d66b ancestor b@000000000000 265 merging rev
299 merging rev 266 my rev@59318016310c+ other rev@e03727d2d66b ancestor rev@924404dff337
300 resolving rev
301 my rev@59318016310c other rev@e03727d2d66b ancestor rev@924404dff337
302 0 files updated, 2 files merged, 1 files removed, 0 files unresolved 267 0 files updated, 2 files merged, 1 files removed, 0 files unresolved
303 (branch merge, don't forget to commit) 268 (branch merge, don't forget to commit)
304 -------------- 269 --------------
305 M b 270 M b
306 -------------- 271 --------------
307 272
308 -------------- 273 --------------
309 test L:nc a b R:up a b W: - 16 get a, merge b no ancestor 274 test L:nc a b R:up a b W: - 16 get a, merge b no ancestor
310 -------------- 275 --------------
311 resolving manifests 276 resolving manifests
312 overwrite None branchmerge True partial False 277 overwrite None partial False
313 ancestor ac809aeed39a local 8dbce441892a remote 924404dff337 278 ancestor 924404dff337 local ac809aeed39a+ remote 8dbce441892a
314 a: remote is newer -> g 279 a: remote is newer -> g
315 b: versions differ -> m 280 b: versions differ -> m
316 rev: versions differ -> m 281 rev: versions differ -> m
317 getting a 282 getting a
318 merging b 283 merging b
319 resolving b 284 my b@ac809aeed39a+ other b@8dbce441892a ancestor b@000000000000
320 my b@ac809aeed39a other b@8dbce441892a ancestor b@000000000000 285 merging rev
321 merging rev 286 my rev@ac809aeed39a+ other rev@8dbce441892a ancestor rev@924404dff337
322 resolving rev
323 my rev@ac809aeed39a other rev@8dbce441892a ancestor rev@924404dff337
324 1 files updated, 2 files merged, 0 files removed, 0 files unresolved 287 1 files updated, 2 files merged, 0 files removed, 0 files unresolved
325 (branch merge, don't forget to commit) 288 (branch merge, don't forget to commit)
326 -------------- 289 --------------
327 M a 290 M a
328 M b 291 M b
330 293
331 -------------- 294 --------------
332 test L:up a b R:nc a b W: - 17 keep a, merge b no ancestor 295 test L:up a b R:nc a b W: - 17 keep a, merge b no ancestor
333 -------------- 296 --------------
334 resolving manifests 297 resolving manifests
335 overwrite None branchmerge True partial False 298 overwrite None partial False
336 ancestor 0b76e65c8289 local 735846fee2d7 remote 924404dff337 299 ancestor 924404dff337 local 0b76e65c8289+ remote 735846fee2d7
337 b: versions differ -> m 300 b: versions differ -> m
338 rev: versions differ -> m 301 rev: versions differ -> m
339 merging b 302 merging b
340 resolving b 303 my b@0b76e65c8289+ other b@735846fee2d7 ancestor b@000000000000
341 my b@0b76e65c8289 other b@735846fee2d7 ancestor b@000000000000 304 merging rev
342 merging rev 305 my rev@0b76e65c8289+ other rev@735846fee2d7 ancestor rev@924404dff337
343 resolving rev
344 my rev@0b76e65c8289 other rev@735846fee2d7 ancestor rev@924404dff337
345 0 files updated, 2 files merged, 0 files removed, 0 files unresolved 306 0 files updated, 2 files merged, 0 files removed, 0 files unresolved
346 (branch merge, don't forget to commit) 307 (branch merge, don't forget to commit)
347 -------------- 308 --------------
348 M b 309 M b
349 C a 310 C a
351 312
352 -------------- 313 --------------
353 test L:nm a b R:up a b W: - 18 merge b no ancestor 314 test L:nm a b R:up a b W: - 18 merge b no ancestor
354 -------------- 315 --------------
355 resolving manifests 316 resolving manifests
356 overwrite None branchmerge True partial False 317 overwrite None partial False
357 ancestor ecf3cb2a4219 local 8dbce441892a remote 924404dff337 318 ancestor 924404dff337 local ecf3cb2a4219+ remote 8dbce441892a
358 b: versions differ -> m 319 b: versions differ -> m
359 rev: versions differ -> m 320 rev: versions differ -> m
360 a: prompt recreating -> g 321 a: prompt recreating -> g
361 getting a 322 getting a
362 merging b 323 merging b
363 resolving b 324 my b@ecf3cb2a4219+ other b@8dbce441892a ancestor b@000000000000
364 my b@ecf3cb2a4219 other b@8dbce441892a ancestor b@000000000000 325 merging rev
365 merging rev 326 my rev@ecf3cb2a4219+ other rev@8dbce441892a ancestor rev@924404dff337
366 resolving rev
367 my rev@ecf3cb2a4219 other rev@8dbce441892a ancestor rev@924404dff337
368 1 files updated, 2 files merged, 0 files removed, 0 files unresolved 327 1 files updated, 2 files merged, 0 files removed, 0 files unresolved
369 (branch merge, don't forget to commit) 328 (branch merge, don't forget to commit)
370 -------------- 329 --------------
371 M a 330 M a
372 M b 331 M b
374 333
375 -------------- 334 --------------
376 test L:up a b R:nm a b W: - 19 merge b no ancestor, prompt remove a 335 test L:up a b R:nm a b W: - 19 merge b no ancestor, prompt remove a
377 -------------- 336 --------------
378 resolving manifests 337 resolving manifests
379 overwrite None branchmerge True partial False 338 overwrite None partial False
380 ancestor 0b76e65c8289 local e03727d2d66b remote 924404dff337 339 ancestor 924404dff337 local 0b76e65c8289+ remote e03727d2d66b
381 b: versions differ -> m 340 b: versions differ -> m
382 rev: versions differ -> m 341 rev: versions differ -> m
383 merging b 342 merging b
384 resolving b 343 my b@0b76e65c8289+ other b@e03727d2d66b ancestor b@000000000000
385 my b@0b76e65c8289 other b@e03727d2d66b ancestor b@000000000000 344 merging rev
386 merging rev 345 my rev@0b76e65c8289+ other rev@e03727d2d66b ancestor rev@924404dff337
387 resolving rev
388 my rev@0b76e65c8289 other rev@e03727d2d66b ancestor rev@924404dff337
389 0 files updated, 2 files merged, 0 files removed, 0 files unresolved 346 0 files updated, 2 files merged, 0 files removed, 0 files unresolved
390 (branch merge, don't forget to commit) 347 (branch merge, don't forget to commit)
391 -------------- 348 --------------
392 M b 349 M b
393 C a 350 C a
395 352
396 -------------- 353 --------------
397 test L:up a R:um a b W: - 20 merge a and b to b, remove a 354 test L:up a R:um a b W: - 20 merge a and b to b, remove a
398 -------------- 355 --------------
399 resolving manifests 356 resolving manifests
400 overwrite None branchmerge True partial False 357 overwrite None partial False
401 ancestor e300d1c794ec local 79cc6877a3b7 remote 924404dff337 358 ancestor 924404dff337 local e300d1c794ec+ remote 79cc6877a3b7
402 a: remote moved -> c 359 a: remote moved -> m
403 rev: versions differ -> m 360 rev: versions differ -> m
404 merging a and b to b 361 merging a and b
405 resolving a 362 my a@e300d1c794ec+ other b@79cc6877a3b7 ancestor a@924404dff337
406 my a@e300d1c794ec other b@79cc6877a3b7 ancestor a@924404dff337
407 copying a to b 363 copying a to b
408 removing a 364 removing a
409 merging rev 365 merging rev
410 resolving rev 366 my rev@e300d1c794ec+ other rev@79cc6877a3b7 ancestor rev@924404dff337
411 my rev@e300d1c794ec other rev@79cc6877a3b7 ancestor rev@924404dff337
412 0 files updated, 2 files merged, 0 files removed, 0 files unresolved 367 0 files updated, 2 files merged, 0 files removed, 0 files unresolved
413 (branch merge, don't forget to commit) 368 (branch merge, don't forget to commit)
414 -------------- 369 --------------
415 M b 370 M b
416 a 371 a
418 373
419 -------------- 374 --------------
420 test L:um a b R:up a W: - 21 merge a and b to b 375 test L:um a b R:up a W: - 21 merge a and b to b
421 -------------- 376 --------------
422 resolving manifests 377 resolving manifests
423 overwrite None branchmerge True partial False 378 overwrite None partial False
424 ancestor ec03c2ca8642 local f4db7e329e71 remote 924404dff337 379 ancestor 924404dff337 local ec03c2ca8642+ remote f4db7e329e71
425 b: local moved -> c 380 b: local moved -> m
426 rev: versions differ -> m 381 rev: versions differ -> m
427 merging b and a to b 382 merging b and a
428 resolving b 383 my b@ec03c2ca8642+ other a@f4db7e329e71 ancestor a@924404dff337
429 my b@ec03c2ca8642 other a@f4db7e329e71 ancestor a@924404dff337 384 merging rev
430 merging rev 385 my rev@ec03c2ca8642+ other rev@f4db7e329e71 ancestor rev@924404dff337
431 resolving rev
432 my rev@ec03c2ca8642 other rev@f4db7e329e71 ancestor rev@924404dff337
433 0 files updated, 2 files merged, 0 files removed, 0 files unresolved 386 0 files updated, 2 files merged, 0 files removed, 0 files unresolved
434 (branch merge, don't forget to commit) 387 (branch merge, don't forget to commit)
435 -------------- 388 --------------
436 M b 389 M b
437 a 390 a
439 392
440 -------------- 393 --------------
441 test L:nm a b R:up a c W: - 23 get c, keep b 394 test L:nm a b R:up a c W: - 23 get c, keep b
442 -------------- 395 --------------
443 resolving manifests 396 resolving manifests
444 overwrite None branchmerge True partial False 397 overwrite None partial False
445 ancestor ecf3cb2a4219 local 2b958612230f remote 924404dff337 398 ancestor 924404dff337 local ecf3cb2a4219+ remote 2b958612230f
446 b: local moved -> c 399 b: local moved -> m
447 rev: versions differ -> m 400 rev: versions differ -> m
448 c: remote created -> g 401 c: remote created -> g
449 merging b and a to b 402 merging b and a
450 resolving b 403 my b@ecf3cb2a4219+ other a@2b958612230f ancestor a@924404dff337
451 my b@ecf3cb2a4219 other a@2b958612230f ancestor a@924404dff337
452 getting c 404 getting c
453 merging rev 405 merging rev
454 resolving rev 406 my rev@ecf3cb2a4219+ other rev@2b958612230f ancestor rev@924404dff337
455 my rev@ecf3cb2a4219 other rev@2b958612230f ancestor rev@924404dff337
456 1 files updated, 2 files merged, 0 files removed, 0 files unresolved 407 1 files updated, 2 files merged, 0 files removed, 0 files unresolved
457 (branch merge, don't forget to commit) 408 (branch merge, don't forget to commit)
458 -------------- 409 --------------
459 M b 410 M b
460 a 411 a