Show More
@@ -279,7 +279,8 b' def _imerge(repo, mynode, orig, fcd, fco' | |||
|
279 | 279 | |
|
280 | 280 | @internaltool('merge3', True, |
|
281 | 281 | _("merging %s incomplete! " |
|
282 |
"(edit conflicts, then use 'hg resolve --mark')\n") |
|
|
282 | "(edit conflicts, then use 'hg resolve --mark')\n"), | |
|
283 | precheck=_symlinkcheck) | |
|
283 | 284 | def _imerge3(repo, mynode, orig, fcd, fco, fca, toolconf, files, labels=None): |
|
284 | 285 | """ |
|
285 | 286 | Uses the internal non-interactive simple merge algorithm for merging |
@@ -82,6 +82,29 b' Symlink is other parent, executable is l' | |||
|
82 | 82 | a is an executable file with content: |
|
83 | 83 | a |
|
84 | 84 | |
|
85 | $ hg update -C 1 | |
|
86 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
|
87 | ||
|
88 | $ hg merge --debug --tool :merge3 | |
|
89 | searching for copies back to rev 1 | |
|
90 | resolving manifests | |
|
91 | branchmerge: True, force: False, partial: False | |
|
92 | ancestor: c334dc3be0da, local: 3574f3e69b1c+, remote: 521a1e40188f | |
|
93 | preserving a for resolve of a | |
|
94 | a: versions differ -> m | |
|
95 | picked tool ':merge3' for a (binary False symlink True) | |
|
96 | merging a | |
|
97 | my a@3574f3e69b1c+ other a@521a1e40188f ancestor a@c334dc3be0da | |
|
98 | warning: internal :merge3 cannot merge symlinks for a | |
|
99 | merging a incomplete! (edit conflicts, then use 'hg resolve --mark') | |
|
100 | 0 files updated, 0 files merged, 0 files removed, 1 files unresolved | |
|
101 | use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon | |
|
102 | [1] | |
|
103 | ||
|
104 | $ tellmeabout a | |
|
105 | a is an executable file with content: | |
|
106 | a | |
|
107 | ||
|
85 | 108 | Update to link without local change should get us a symlink (issue3316): |
|
86 | 109 | |
|
87 | 110 | $ hg up -C 0 |
General Comments 0
You need to be logged in to leave comments.
Login now