37 a: versions differ -> m (premerge) |
37 a: versions differ -> m (premerge) |
38 tool internal:merge (for pattern a) can't handle symlinks |
38 tool internal:merge (for pattern a) can't handle symlinks |
39 couldn't find merge tool hgmerge |
39 couldn't find merge tool hgmerge |
40 no tool found to merge a |
40 no tool found to merge a |
41 picked tool ':prompt' for a (binary False symlink True changedelete False) |
41 picked tool ':prompt' for a (binary False symlink True changedelete False) |
42 keep (l)ocal [working copy], take (o)ther [merge rev], or leave (u)nresolved for a? u |
42 file 'a' needs to be resolved. |
|
43 You can keep (l)ocal [working copy], take (o)ther [merge rev], or leave (u)nresolved. |
|
44 What do you want to do? u |
43 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
45 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
44 use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon |
46 use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon |
45 [1] |
47 [1] |
46 |
48 |
47 $ tellmeabout a |
49 $ tellmeabout a |
166 preserving a for resolve of a |
168 preserving a for resolve of a |
167 a: versions differ -> m (premerge) |
169 a: versions differ -> m (premerge) |
168 (couldn't find merge tool hgmerge|tool hgmerge can't handle symlinks) (re) |
170 (couldn't find merge tool hgmerge|tool hgmerge can't handle symlinks) (re) |
169 no tool found to merge a |
171 no tool found to merge a |
170 picked tool ':prompt' for a (binary False symlink True changedelete False) |
172 picked tool ':prompt' for a (binary False symlink True changedelete False) |
171 keep (l)ocal [working copy], take (o)ther [destination], or leave (u)nresolved for a? u |
173 file 'a' needs to be resolved. |
|
174 You can keep (l)ocal [working copy], take (o)ther [destination], or leave (u)nresolved. |
|
175 What do you want to do? u |
172 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
176 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
173 use 'hg resolve' to retry unresolved file merges |
177 use 'hg resolve' to retry unresolved file merges |
174 updated to "521a1e40188f: symlink" |
178 updated to "521a1e40188f: symlink" |
175 1 other heads for branch "default" |
179 1 other heads for branch "default" |
176 [1] |
180 [1] |
201 $ ln -s base f |
205 $ ln -s base f |
202 $ hg ci -qm2 |
206 $ hg ci -qm2 |
203 $ hg merge |
207 $ hg merge |
204 tool internal:merge (for pattern f) can't handle symlinks |
208 tool internal:merge (for pattern f) can't handle symlinks |
205 no tool found to merge f |
209 no tool found to merge f |
206 keep (l)ocal [working copy], take (o)ther [merge rev], or leave (u)nresolved for f? u |
210 file 'f' needs to be resolved. |
|
211 You can keep (l)ocal [working copy], take (o)ther [merge rev], or leave (u)nresolved. |
|
212 What do you want to do? u |
207 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 |
208 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 |
209 [1] |
215 [1] |
210 $ tellmeabout f |
216 $ tellmeabout f |
211 f is a symlink: |
217 f is a symlink: |
213 |
219 |
214 $ hg up -Cqr1 |
220 $ hg up -Cqr1 |
215 $ hg merge |
221 $ hg merge |
216 tool internal:merge (for pattern f) can't handle symlinks |
222 tool internal:merge (for pattern f) can't handle symlinks |
217 no tool found to merge f |
223 no tool found to merge f |
218 keep (l)ocal [working copy], take (o)ther [merge rev], or leave (u)nresolved for f? u |
224 file 'f' needs to be resolved. |
|
225 You can keep (l)ocal [working copy], take (o)ther [merge rev], or leave (u)nresolved. |
|
226 What do you want to do? u |
219 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
227 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
220 use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon |
228 use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon |
221 [1] |
229 [1] |
222 $ tellmeabout f |
230 $ tellmeabout f |
223 f is a plain file with content: |
231 f is a plain file with content: |
240 $ ln -s dangling f |
248 $ ln -s dangling f |
241 $ hg ci -qm2 |
249 $ hg ci -qm2 |
242 $ hg merge |
250 $ hg merge |
243 tool internal:merge (for pattern f) can't handle symlinks |
251 tool internal:merge (for pattern f) can't handle symlinks |
244 no tool found to merge f |
252 no tool found to merge f |
245 keep (l)ocal [working copy], take (o)ther [merge rev], or leave (u)nresolved for f? u |
253 file 'f' needs to be resolved. |
|
254 You can keep (l)ocal [working copy], take (o)ther [merge rev], or leave (u)nresolved. |
|
255 What do you want to do? u |
246 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
256 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
247 use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon |
257 use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon |
248 [1] |
258 [1] |
249 $ tellmeabout f |
259 $ tellmeabout f |
250 f is a symlink: |
260 f is a symlink: |
252 |
262 |
253 $ hg up -Cqr1 |
263 $ hg up -Cqr1 |
254 $ hg merge |
264 $ hg merge |
255 tool internal:merge (for pattern f) can't handle symlinks |
265 tool internal:merge (for pattern f) can't handle symlinks |
256 no tool found to merge f |
266 no tool found to merge f |
257 keep (l)ocal [working copy], take (o)ther [merge rev], or leave (u)nresolved for f? u |
267 file 'f' needs to be resolved. |
|
268 You can keep (l)ocal [working copy], take (o)ther [merge rev], or leave (u)nresolved. |
|
269 What do you want to do? u |
258 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
270 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
259 use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon |
271 use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon |
260 [1] |
272 [1] |
261 $ tellmeabout f |
273 $ tellmeabout f |
262 f is a plain file with content: |
274 f is a plain file with content: |
335 merging b |
347 merging b |
336 merging bx |
348 merging bx |
337 warning: cannot merge flags for c without common ancestor - keeping local flags |
349 warning: cannot merge flags for c without common ancestor - keeping local flags |
338 tool internal:merge (for pattern d) can't handle symlinks |
350 tool internal:merge (for pattern d) can't handle symlinks |
339 no tool found to merge d |
351 no tool found to merge d |
340 keep (l)ocal [working copy], take (o)ther [merge rev], or leave (u)nresolved for d? u |
352 file 'd' needs to be resolved. |
341 tool internal:merge (for pattern f) can't handle symlinks |
353 You can keep (l)ocal [working copy], take (o)ther [merge rev], or leave (u)nresolved. |
342 no tool found to merge f |
354 What do you want to do? u |
343 keep (l)ocal [working copy], take (o)ther [merge rev], or leave (u)nresolved for f? u |
355 tool internal:merge (for pattern f) can't handle symlinks |
|
356 no tool found to merge f |
|
357 file 'f' needs to be resolved. |
|
358 You can keep (l)ocal [working copy], take (o)ther [merge rev], or leave (u)nresolved. |
|
359 What do you want to do? u |
344 tool internal:merge (for pattern h) can't handle symlinks |
360 tool internal:merge (for pattern h) can't handle symlinks |
345 no tool found to merge h |
361 no tool found to merge h |
346 keep (l)ocal [working copy], take (o)ther [merge rev], or leave (u)nresolved for h? u |
362 file 'h' needs to be resolved. |
|
363 You can keep (l)ocal [working copy], take (o)ther [merge rev], or leave (u)nresolved. |
|
364 What do you want to do? u |
347 warning: conflicts while merging a! (edit, then use 'hg resolve --mark') |
365 warning: conflicts while merging a! (edit, then use 'hg resolve --mark') |
348 warning: conflicts while merging b! (edit, then use 'hg resolve --mark') |
366 warning: conflicts while merging b! (edit, then use 'hg resolve --mark') |
349 warning: conflicts while merging bx! (edit, then use 'hg resolve --mark') |
367 warning: conflicts while merging bx! (edit, then use 'hg resolve --mark') |
350 3 files updated, 0 files merged, 0 files removed, 6 files unresolved |
368 3 files updated, 0 files merged, 0 files removed, 6 files unresolved |
351 use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon |
369 use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon |
397 merging b |
415 merging b |
398 merging bx |
416 merging bx |
399 warning: cannot merge flags for c without common ancestor - keeping local flags |
417 warning: cannot merge flags for c without common ancestor - keeping local flags |
400 tool internal:merge (for pattern d) can't handle symlinks |
418 tool internal:merge (for pattern d) can't handle symlinks |
401 no tool found to merge d |
419 no tool found to merge d |
402 keep (l)ocal [working copy], take (o)ther [merge rev], or leave (u)nresolved for d? u |
420 file 'd' needs to be resolved. |
403 tool internal:merge (for pattern f) can't handle symlinks |
421 You can keep (l)ocal [working copy], take (o)ther [merge rev], or leave (u)nresolved. |
404 no tool found to merge f |
422 What do you want to do? u |
405 keep (l)ocal [working copy], take (o)ther [merge rev], or leave (u)nresolved for f? u |
423 tool internal:merge (for pattern f) can't handle symlinks |
|
424 no tool found to merge f |
|
425 file 'f' needs to be resolved. |
|
426 You can keep (l)ocal [working copy], take (o)ther [merge rev], or leave (u)nresolved. |
|
427 What do you want to do? u |
406 tool internal:merge (for pattern h) can't handle symlinks |
428 tool internal:merge (for pattern h) can't handle symlinks |
407 no tool found to merge h |
429 no tool found to merge h |
408 keep (l)ocal [working copy], take (o)ther [merge rev], or leave (u)nresolved for h? u |
430 file 'h' needs to be resolved. |
|
431 You can keep (l)ocal [working copy], take (o)ther [merge rev], or leave (u)nresolved. |
|
432 What do you want to do? u |
409 warning: conflicts while merging a! (edit, then use 'hg resolve --mark') |
433 warning: conflicts while merging a! (edit, then use 'hg resolve --mark') |
410 warning: conflicts while merging b! (edit, then use 'hg resolve --mark') |
434 warning: conflicts while merging b! (edit, then use 'hg resolve --mark') |
411 warning: conflicts while merging bx! (edit, then use 'hg resolve --mark') |
435 warning: conflicts while merging bx! (edit, then use 'hg resolve --mark') |
412 3 files updated, 0 files merged, 0 files removed, 6 files unresolved |
436 3 files updated, 0 files merged, 0 files removed, 6 files unresolved |
413 use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon |
437 use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon |