equal
deleted
inserted
replaced
32 $ hg merge --debug |
32 $ hg merge --debug |
33 resolving manifests |
33 resolving manifests |
34 branchmerge: True, force: False, partial: False |
34 branchmerge: True, force: False, partial: False |
35 ancestor: c334dc3be0da, local: 521a1e40188f+, remote: 3574f3e69b1c |
35 ancestor: c334dc3be0da, local: 521a1e40188f+, remote: 3574f3e69b1c |
36 preserving a for resolve of a |
36 preserving a for resolve of a |
37 a: versions differ -> m (premerge) |
37 a: versions differ -> m |
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 file 'a' needs to be resolved. |
42 file 'a' needs to be resolved. |
66 $ hg merge --debug --tool :union |
66 $ hg merge --debug --tool :union |
67 resolving manifests |
67 resolving manifests |
68 branchmerge: True, force: False, partial: False |
68 branchmerge: True, force: False, partial: False |
69 ancestor: c334dc3be0da, local: 3574f3e69b1c+, remote: 521a1e40188f |
69 ancestor: c334dc3be0da, local: 3574f3e69b1c+, remote: 521a1e40188f |
70 preserving a for resolve of a |
70 preserving a for resolve of a |
71 a: versions differ -> m (premerge) |
71 a: versions differ -> m |
72 picked tool ':union' for a (binary False symlink True changedelete False) |
72 picked tool ':union' for a (binary False symlink True changedelete False) |
73 merging a |
73 merging a |
74 my a@3574f3e69b1c+ other a@521a1e40188f ancestor a@c334dc3be0da |
74 my a@3574f3e69b1c+ other a@521a1e40188f ancestor a@c334dc3be0da |
75 warning: internal :union cannot merge symlinks for a |
75 warning: internal :union cannot merge symlinks for a |
76 warning: conflicts while merging a! (edit, then use 'hg resolve --mark') |
76 warning: conflicts while merging a! (edit, then use 'hg resolve --mark') |
88 $ hg merge --debug --tool :merge3 |
88 $ hg merge --debug --tool :merge3 |
89 resolving manifests |
89 resolving manifests |
90 branchmerge: True, force: False, partial: False |
90 branchmerge: True, force: False, partial: False |
91 ancestor: c334dc3be0da, local: 3574f3e69b1c+, remote: 521a1e40188f |
91 ancestor: c334dc3be0da, local: 3574f3e69b1c+, remote: 521a1e40188f |
92 preserving a for resolve of a |
92 preserving a for resolve of a |
93 a: versions differ -> m (premerge) |
93 a: versions differ -> m |
94 picked tool ':merge3' for a (binary False symlink True changedelete False) |
94 picked tool ':merge3' for a (binary False symlink True changedelete False) |
95 merging a |
95 merging a |
96 my a@3574f3e69b1c+ other a@521a1e40188f ancestor a@c334dc3be0da |
96 my a@3574f3e69b1c+ other a@521a1e40188f ancestor a@c334dc3be0da |
97 warning: internal :merge3 cannot merge symlinks for a |
97 warning: internal :merge3 cannot merge symlinks for a |
98 warning: conflicts while merging a! (edit, then use 'hg resolve --mark') |
98 warning: conflicts while merging a! (edit, then use 'hg resolve --mark') |
110 $ hg merge --debug --tool :merge-local |
110 $ hg merge --debug --tool :merge-local |
111 resolving manifests |
111 resolving manifests |
112 branchmerge: True, force: False, partial: False |
112 branchmerge: True, force: False, partial: False |
113 ancestor: c334dc3be0da, local: 3574f3e69b1c+, remote: 521a1e40188f |
113 ancestor: c334dc3be0da, local: 3574f3e69b1c+, remote: 521a1e40188f |
114 preserving a for resolve of a |
114 preserving a for resolve of a |
115 a: versions differ -> m (premerge) |
115 a: versions differ -> m |
116 picked tool ':merge-local' for a (binary False symlink True changedelete False) |
116 picked tool ':merge-local' for a (binary False symlink True changedelete False) |
117 merging a |
117 merging a |
118 my a@3574f3e69b1c+ other a@521a1e40188f ancestor a@c334dc3be0da |
118 my a@3574f3e69b1c+ other a@521a1e40188f ancestor a@c334dc3be0da |
119 warning: internal :merge-local cannot merge symlinks for a |
119 warning: internal :merge-local cannot merge symlinks for a |
120 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
120 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
131 $ hg merge --debug --tool :merge-other |
131 $ hg merge --debug --tool :merge-other |
132 resolving manifests |
132 resolving manifests |
133 branchmerge: True, force: False, partial: False |
133 branchmerge: True, force: False, partial: False |
134 ancestor: c334dc3be0da, local: 3574f3e69b1c+, remote: 521a1e40188f |
134 ancestor: c334dc3be0da, local: 3574f3e69b1c+, remote: 521a1e40188f |
135 preserving a for resolve of a |
135 preserving a for resolve of a |
136 a: versions differ -> m (premerge) |
136 a: versions differ -> m |
137 picked tool ':merge-other' for a (binary False symlink True changedelete False) |
137 picked tool ':merge-other' for a (binary False symlink True changedelete False) |
138 merging a |
138 merging a |
139 my a@3574f3e69b1c+ other a@521a1e40188f ancestor a@c334dc3be0da |
139 my a@3574f3e69b1c+ other a@521a1e40188f ancestor a@c334dc3be0da |
140 warning: internal :merge-other cannot merge symlinks for a |
140 warning: internal :merge-other cannot merge symlinks for a |
141 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
141 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
164 $ HGMERGE= hg up -y --debug --config ui.merge= |
164 $ HGMERGE= hg up -y --debug --config ui.merge= |
165 resolving manifests |
165 resolving manifests |
166 branchmerge: False, force: False, partial: False |
166 branchmerge: False, force: False, partial: False |
167 ancestor: c334dc3be0da, local: c334dc3be0da+, remote: 521a1e40188f |
167 ancestor: c334dc3be0da, local: c334dc3be0da+, remote: 521a1e40188f |
168 preserving a for resolve of a |
168 preserving a for resolve of a |
169 a: versions differ -> m (premerge) |
169 a: versions differ -> m |
170 (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) |
171 no tool found to merge a |
171 no tool found to merge a |
172 picked tool ':prompt' for a (binary False symlink True changedelete False) |
172 picked tool ':prompt' for a (binary False symlink True changedelete False) |
173 file 'a' needs to be resolved. |
173 file 'a' needs to be resolved. |
174 You can keep (l)ocal [working copy], take (o)ther [destination], or leave (u)nresolved. |
174 You can keep (l)ocal [working copy], take (o)ther [destination], or leave (u)nresolved. |
341 $ ln -s 2 h |
341 $ ln -s 2 h |
342 $ hg ci -Aqm2 |
342 $ hg ci -Aqm2 |
343 |
343 |
344 $ hg merge |
344 $ hg merge |
345 merging a |
345 merging a |
|
346 warning: conflicts while merging a! (edit, then use 'hg resolve --mark') |
346 warning: cannot merge flags for b without common ancestor - keeping local flags |
347 warning: cannot merge flags for b without common ancestor - keeping local flags |
347 merging b |
348 merging b |
|
349 warning: conflicts while merging b! (edit, then use 'hg resolve --mark') |
348 merging bx |
350 merging bx |
|
351 warning: conflicts while merging bx! (edit, then use 'hg resolve --mark') |
349 warning: cannot merge flags for c without common ancestor - keeping local flags |
352 warning: cannot merge flags for c without common ancestor - keeping local flags |
350 tool internal:merge (for pattern d) can't handle symlinks |
353 tool internal:merge (for pattern d) can't handle symlinks |
351 no tool found to merge d |
354 no tool found to merge d |
352 file 'd' needs to be resolved. |
355 file 'd' needs to be resolved. |
353 You can keep (l)ocal [working copy], take (o)ther [merge rev], or leave (u)nresolved. |
356 You can keep (l)ocal [working copy], take (o)ther [merge rev], or leave (u)nresolved. |
360 tool internal:merge (for pattern h) can't handle symlinks |
363 tool internal:merge (for pattern h) can't handle symlinks |
361 no tool found to merge h |
364 no tool found to merge h |
362 file 'h' needs to be resolved. |
365 file 'h' needs to be resolved. |
363 You can keep (l)ocal [working copy], take (o)ther [merge rev], or leave (u)nresolved. |
366 You can keep (l)ocal [working copy], take (o)ther [merge rev], or leave (u)nresolved. |
364 What do you want to do? u |
367 What do you want to do? u |
365 warning: conflicts while merging a! (edit, then use 'hg resolve --mark') |
|
366 warning: conflicts while merging b! (edit, then use 'hg resolve --mark') |
|
367 warning: conflicts while merging bx! (edit, then use 'hg resolve --mark') |
|
368 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 |
369 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 |
370 [1] |
370 [1] |
371 $ hg resolve -l |
371 $ hg resolve -l |
372 U a |
372 U a |
409 h -> 2 |
409 h -> 2 |
410 |
410 |
411 $ hg up -Cqr1 |
411 $ hg up -Cqr1 |
412 $ hg merge |
412 $ hg merge |
413 merging a |
413 merging a |
|
414 warning: conflicts while merging a! (edit, then use 'hg resolve --mark') |
414 warning: cannot merge flags for b without common ancestor - keeping local flags |
415 warning: cannot merge flags for b without common ancestor - keeping local flags |
415 merging b |
416 merging b |
|
417 warning: conflicts while merging b! (edit, then use 'hg resolve --mark') |
416 merging bx |
418 merging bx |
|
419 warning: conflicts while merging bx! (edit, then use 'hg resolve --mark') |
417 warning: cannot merge flags for c without common ancestor - keeping local flags |
420 warning: cannot merge flags for c without common ancestor - keeping local flags |
418 tool internal:merge (for pattern d) can't handle symlinks |
421 tool internal:merge (for pattern d) can't handle symlinks |
419 no tool found to merge d |
422 no tool found to merge d |
420 file 'd' needs to be resolved. |
423 file 'd' needs to be resolved. |
421 You can keep (l)ocal [working copy], take (o)ther [merge rev], or leave (u)nresolved. |
424 You can keep (l)ocal [working copy], take (o)ther [merge rev], or leave (u)nresolved. |
428 tool internal:merge (for pattern h) can't handle symlinks |
431 tool internal:merge (for pattern h) can't handle symlinks |
429 no tool found to merge h |
432 no tool found to merge h |
430 file 'h' needs to be resolved. |
433 file 'h' needs to be resolved. |
431 You can keep (l)ocal [working copy], take (o)ther [merge rev], or leave (u)nresolved. |
434 You can keep (l)ocal [working copy], take (o)ther [merge rev], or leave (u)nresolved. |
432 What do you want to do? u |
435 What do you want to do? u |
433 warning: conflicts while merging a! (edit, then use 'hg resolve --mark') |
|
434 warning: conflicts while merging b! (edit, then use 'hg resolve --mark') |
|
435 warning: conflicts while merging bx! (edit, then use 'hg resolve --mark') |
|
436 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 |
437 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 |
438 [1] |
438 [1] |
439 $ tellmeabout a |
439 $ tellmeabout a |
440 a is a plain file with content: |
440 a is a plain file with content: |