[SVN-3287] WC entries format number to be bumped now that tree-conflict storage is included

• Type: Task
• Status: Closed
• Priority: Critical
• Resolution: Fixed
• Affects Version/s: trunk
• Fix Version/s: 1.6.0
• Component/s: libsvn_wc
• Labels: tree-conflicts
• Assignee: Unassigned
• Reporter: Julian Foad
• Created: 16/Sep/08 15:14
• Updated: 27/Oct/18 16:33
• Resolved: 10/Mar/09 15:22

Description

The trunk now holds tree-conflict data in the this_dir entry in the WC entries
file. The format number remains at 9, and the change is somewhat compatible such
that it is usable for development purposes.

Before release the entries format version number need to be bumped to 10.

The consequences of not doing so would include that all outstanding tree
conflicts in a WC directory would suddenly appear to have been resolved if a
non-aware client modified the entries in that directory.

Issue Links

• blocks: SVN-2282 handle file delete/edit/add conflicts: tree changes and conflicts
• is depended upon by: SVN-2282 handle file delete/edit/add conflicts: tree changes and conflicts