Show More
@@ -204,6 +204,10 b' def _imerge(repo, mynode, orig, fcd, fco' | |||||
204 | Uses the internal non-interactive simple merge algorithm for merging |
|
204 | Uses the internal non-interactive simple merge algorithm for merging | |
205 | files. It will fail if there are any conflicts and leave markers in |
|
205 | files. It will fail if there are any conflicts and leave markers in | |
206 | the partially merged file.""" |
|
206 | the partially merged file.""" | |
|
207 | tool, toolpath, binary, symlink = toolconf | |||
|
208 | if symlink: | |||
|
209 | return False, 1 | |||
|
210 | ||||
207 | r = _premerge(repo, toolconf, files) |
|
211 | r = _premerge(repo, toolconf, files) | |
208 | if r: |
|
212 | if r: | |
209 | a, b, c, back = files |
|
213 | a, b, c, back = files |
@@ -832,3 +832,20 b" cat is a bad merge-tool and doesn't chan" | |||||
832 | # hg stat |
|
832 | # hg stat | |
833 | M f |
|
833 | M f | |
834 | ? f.orig |
|
834 | ? f.orig | |
|
835 | ||||
|
836 | #if symlink | |||
|
837 | ||||
|
838 | internal merge cannot handle symlinks and shouldn't try: | |||
|
839 | ||||
|
840 | $ hg update -q -C 1 | |||
|
841 | $ rm f | |||
|
842 | $ ln -s symlink f | |||
|
843 | $ hg commit -qm 'f is symlink' | |||
|
844 | $ hg merge -r 2 --tool internal:merge | |||
|
845 | merging f | |||
|
846 | merging f incomplete! (edit conflicts, then use 'hg resolve --mark') | |||
|
847 | 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 | [1] | |||
|
850 | ||||
|
851 | #endif |
General Comments 0
You need to be logged in to leave comments.
Login now