Mercurial > hg
comparison mercurial/filemerge.py @ 18325:297bf69966a0
merge: warn when internal:merge cannot merge symlinks
A follow-up to d084df89d948.
internal:merge should never be picked for merging symlinks ... but in the test
suite we have HGMERGE="internal:merge" which bypasses all the usual merge-tool
cleverness. Without any output it can be hard to figure out what happened and
where the problem is.
author | Mads Kiilerich <mads@kiilerich.com> |
---|---|
date | Tue, 15 Jan 2013 01:05:11 +0100 |
parents | a35d0128545e |
children | c58b6ab4c26f |
comparison
equal
deleted
inserted
replaced
18324:2eae2f9e85ef | 18325:297bf69966a0 |
---|---|
206 Uses the internal non-interactive simple merge algorithm for merging | 206 Uses the internal non-interactive simple merge algorithm for merging |
207 files. It will fail if there are any conflicts and leave markers in | 207 files. It will fail if there are any conflicts and leave markers in |
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) |
214 if r: | 216 if r: |
215 a, b, c, back = files | 217 a, b, c, back = files |