[SVN-2035] Property merging is seriously flawed

• Type: Bug
• Status: Closed
• Priority: Major
• Resolution: Fixed
• Affects Version/s: all
• Fix Version/s: 1.3.0
• Component/s: libsvn_client
• Assignee: Unassigned
• Reporter: Max Oliver Bowsher
• Created: 01/Sep/04 22:18
• Updated: 27/Oct/18 16:39
• Resolved: 10/Mar/09 15:22

Description

Cross-component: libsvn_client libsvn_wc

Currently libsvn_client is handling propchanges as 'set' operations, rather than
deltas. Undesirable effects include:

2 successive merges affecting the same property will *always* conflict.

A merge from branch -> trunk will silently overwrite trunk propchanges with
branch propchanges when they should conflict.