[SVN-3919] spurious property conflict during reintegrate merge

• Type: Bug
• Status: Closed
• Priority: Major
• Resolution: Fixed
• Affects Version/s: trunk
• Fix Version/s: 1.7.0
• Component/s: unknown
• Assignee: Unassigned
• Reporter: Stefan Sperling
• Created: 10/Jun/11 09:27
• Updated: 27/Oct/18 16:28
• Resolved: 15/Jun/11 18:19

Description

The attached script causes a property conflict when merging a branch back into
trunk, even though the property values are exactly the same.
Subversion should not flag a conflict in this situation.

Reported by Brian Neal in this thread:
http://svn.haxx.se/users/archive-2011-06/0106.shtml