39 resolving manifests |
34 resolving manifests |
40 branchmerge: True, force: False, partial: False |
35 branchmerge: True, force: False, partial: False |
41 ancestor: c334dc3be0da, local: 521a1e40188f+, remote: 3574f3e69b1c |
36 ancestor: c334dc3be0da, local: 521a1e40188f+, remote: 3574f3e69b1c |
42 preserving a for resolve of a |
37 preserving a for resolve of a |
43 a: versions differ -> m (premerge) |
38 a: versions differ -> m (premerge) |
44 tool :merge (for pattern a) can't handle symlinks |
39 tool internal:merge (for pattern a) can't handle symlinks |
45 couldn't find merge tool hgmerge |
40 couldn't find merge tool hgmerge |
46 no tool found to merge a |
41 no tool found to merge a |
47 picked tool ':prompt' for a (binary False symlink True changedelete False) |
42 picked tool ':prompt' for a (binary False symlink True changedelete False) |
48 keep (l)ocal [working copy], take (o)ther [merge rev], or leave (u)nresolved for a? u |
43 keep (l)ocal [working copy], take (o)ther [merge rev], or leave (u)nresolved for a? u |
49 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
44 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
210 $ hg up -qr0 |
205 $ hg up -qr0 |
211 $ rm f |
206 $ rm f |
212 $ ln -s base f |
207 $ ln -s base f |
213 $ hg ci -qm2 |
208 $ hg ci -qm2 |
214 $ hg merge |
209 $ hg merge |
215 tool :merge (for pattern f) can't handle symlinks |
210 tool internal:merge (for pattern f) can't handle symlinks |
216 no tool found to merge f |
211 no tool found to merge f |
217 keep (l)ocal [working copy], take (o)ther [merge rev], or leave (u)nresolved for f? u |
212 keep (l)ocal [working copy], take (o)ther [merge rev], or leave (u)nresolved for f? u |
218 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
213 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
219 use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon |
214 use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon |
220 [1] |
215 [1] |
222 f is a symlink: |
217 f is a symlink: |
223 f -> base |
218 f -> base |
224 |
219 |
225 $ hg up -Cqr1 |
220 $ hg up -Cqr1 |
226 $ hg merge |
221 $ hg merge |
227 tool :merge (for pattern f) can't handle symlinks |
222 tool internal:merge (for pattern f) can't handle symlinks |
228 no tool found to merge f |
223 no tool found to merge f |
229 keep (l)ocal [working copy], take (o)ther [merge rev], or leave (u)nresolved for f? u |
224 keep (l)ocal [working copy], take (o)ther [merge rev], or leave (u)nresolved for f? u |
230 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
225 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
231 use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon |
226 use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon |
232 [1] |
227 [1] |
249 $ hg up -qr0 |
244 $ hg up -qr0 |
250 $ rm f |
245 $ rm f |
251 $ ln -s dangling f |
246 $ ln -s dangling f |
252 $ hg ci -qm2 |
247 $ hg ci -qm2 |
253 $ hg merge |
248 $ hg merge |
254 tool :merge (for pattern f) can't handle symlinks |
249 tool internal:merge (for pattern f) can't handle symlinks |
255 no tool found to merge f |
250 no tool found to merge f |
256 keep (l)ocal [working copy], take (o)ther [merge rev], or leave (u)nresolved for f? u |
251 keep (l)ocal [working copy], take (o)ther [merge rev], or leave (u)nresolved for f? u |
257 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
252 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
258 use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon |
253 use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon |
259 [1] |
254 [1] |
261 f is a symlink: |
256 f is a symlink: |
262 f -> dangling |
257 f -> dangling |
263 |
258 |
264 $ hg up -Cqr1 |
259 $ hg up -Cqr1 |
265 $ hg merge |
260 $ hg merge |
266 tool :merge (for pattern f) can't handle symlinks |
261 tool internal:merge (for pattern f) can't handle symlinks |
267 no tool found to merge f |
262 no tool found to merge f |
268 keep (l)ocal [working copy], take (o)ther [merge rev], or leave (u)nresolved for f? u |
263 keep (l)ocal [working copy], take (o)ther [merge rev], or leave (u)nresolved for f? u |
269 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
264 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
270 use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon |
265 use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon |
271 [1] |
266 [1] |
344 merging a |
339 merging a |
345 warning: cannot merge flags for b without common ancestor - keeping local flags |
340 warning: cannot merge flags for b without common ancestor - keeping local flags |
346 merging b |
341 merging b |
347 merging bx |
342 merging bx |
348 warning: cannot merge flags for c without common ancestor - keeping local flags |
343 warning: cannot merge flags for c without common ancestor - keeping local flags |
349 tool :merge (for pattern d) can't handle symlinks |
344 tool internal:merge (for pattern d) can't handle symlinks |
350 no tool found to merge d |
345 no tool found to merge d |
351 keep (l)ocal [working copy], take (o)ther [merge rev], or leave (u)nresolved for d? u |
346 keep (l)ocal [working copy], take (o)ther [merge rev], or leave (u)nresolved for d? u |
352 tool :merge (for pattern f) can't handle symlinks |
347 tool internal:merge (for pattern f) can't handle symlinks |
353 no tool found to merge f |
348 no tool found to merge f |
354 keep (l)ocal [working copy], take (o)ther [merge rev], or leave (u)nresolved for f? u |
349 keep (l)ocal [working copy], take (o)ther [merge rev], or leave (u)nresolved for f? u |
355 tool :merge (for pattern h) can't handle symlinks |
350 tool internal:merge (for pattern h) can't handle symlinks |
356 no tool found to merge h |
351 no tool found to merge h |
357 keep (l)ocal [working copy], take (o)ther [merge rev], or leave (u)nresolved for h? u |
352 keep (l)ocal [working copy], take (o)ther [merge rev], or leave (u)nresolved for h? u |
358 warning: conflicts while merging a! (edit, then use 'hg resolve --mark') |
353 warning: conflicts while merging a! (edit, then use 'hg resolve --mark') |
359 warning: conflicts while merging b! (edit, then use 'hg resolve --mark') |
354 warning: conflicts while merging b! (edit, then use 'hg resolve --mark') |
360 warning: conflicts while merging bx! (edit, then use 'hg resolve --mark') |
355 warning: conflicts while merging bx! (edit, then use 'hg resolve --mark') |
406 merging a |
401 merging a |
407 warning: cannot merge flags for b without common ancestor - keeping local flags |
402 warning: cannot merge flags for b without common ancestor - keeping local flags |
408 merging b |
403 merging b |
409 merging bx |
404 merging bx |
410 warning: cannot merge flags for c without common ancestor - keeping local flags |
405 warning: cannot merge flags for c without common ancestor - keeping local flags |
411 tool :merge (for pattern d) can't handle symlinks |
406 tool internal:merge (for pattern d) can't handle symlinks |
412 no tool found to merge d |
407 no tool found to merge d |
413 keep (l)ocal [working copy], take (o)ther [merge rev], or leave (u)nresolved for d? u |
408 keep (l)ocal [working copy], take (o)ther [merge rev], or leave (u)nresolved for d? u |
414 tool :merge (for pattern f) can't handle symlinks |
409 tool internal:merge (for pattern f) can't handle symlinks |
415 no tool found to merge f |
410 no tool found to merge f |
416 keep (l)ocal [working copy], take (o)ther [merge rev], or leave (u)nresolved for f? u |
411 keep (l)ocal [working copy], take (o)ther [merge rev], or leave (u)nresolved for f? u |
417 tool :merge (for pattern h) can't handle symlinks |
412 tool internal:merge (for pattern h) can't handle symlinks |
418 no tool found to merge h |
413 no tool found to merge h |
419 keep (l)ocal [working copy], take (o)ther [merge rev], or leave (u)nresolved for h? u |
414 keep (l)ocal [working copy], take (o)ther [merge rev], or leave (u)nresolved for h? u |
420 warning: conflicts while merging a! (edit, then use 'hg resolve --mark') |
415 warning: conflicts while merging a! (edit, then use 'hg resolve --mark') |
421 warning: conflicts while merging b! (edit, then use 'hg resolve --mark') |
416 warning: conflicts while merging b! (edit, then use 'hg resolve --mark') |
422 warning: conflicts while merging bx! (edit, then use 'hg resolve --mark') |
417 warning: conflicts while merging bx! (edit, then use 'hg resolve --mark') |