[SVN-4198] merge between different repositories reports conflicts where there are none

• Type: Bug
• Status: Closed
• Priority: Trivial
• Resolution: Invalid
• Affects Version/s: 1.6.x
• Fix Version/s: ---
• Component/s: contrib/svnmerge.py

Environment

Windows XP

• Assignee: Blair Zajac
• Reporter: Subversion Importer
• Created: 20/Jun/12 13:17
• Updated: 27/Oct/18 16:30
• Resolved: 14/Dec/12 20:44

Description

When merging changes from one repository to another unrelated one (except for
the availability of similar code), it sometimes occurs that merge reports conflicts.
When inspecting the conflict, it does not mark any conflicts (using
TortoiseSVN's conflict resolver TortoiseMerge), hence I select resolved.

Closer inspection reveals that the new version has Linux end of lines, while I'm
working on Windows XP.

So there's 2 things happening here:
- Merge reports conflicts where there aren't actually any
- line endings are being replaced by non-native line endings

Original issue reported by michael_edna