Show More
@@ -208,6 +208,8 b' def _imerge(repo, mynode, orig, fcd, fco' | |||||
208 | the partially merged file.""" |
|
208 | the partially merged file.""" | |
209 | tool, toolpath, binary, symlink = toolconf |
|
209 | tool, toolpath, binary, symlink = toolconf | |
210 | if symlink: |
|
210 | if symlink: | |
|
211 | repo.ui.warn(_('warning: internal:merge cannot merge symlinks ' | |||
|
212 | 'for %s\n') % fcd.path()) | |||
211 | return False, 1 |
|
213 | return False, 1 | |
212 |
|
214 | |||
213 | r = _premerge(repo, toolconf, files) |
|
215 | r = _premerge(repo, toolconf, files) |
@@ -843,6 +843,7 b' internal merge cannot handle symlinks an' | |||||
843 | $ hg commit -qm 'f is symlink' |
|
843 | $ hg commit -qm 'f is symlink' | |
844 | $ hg merge -r 2 --tool internal:merge |
|
844 | $ hg merge -r 2 --tool internal:merge | |
845 | merging f |
|
845 | merging f | |
|
846 | warning: internal:merge cannot merge symlinks for f | |||
846 | merging f incomplete! (edit conflicts, then use 'hg resolve --mark') |
|
847 | merging f incomplete! (edit conflicts, then use 'hg resolve --mark') | |
847 | 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
|
848 | 0 files updated, 0 files merged, 0 files removed, 1 files unresolved | |
848 | use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon |
|
849 | use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon |
General Comments 0
You need to be logged in to leave comments.
Login now