[SVN-3328] Update can't record >1 add/edit tree conflict per dir

• Type: Bug
• Status: Closed
• Priority: Critical
• Resolution: Fixed
• Affects Version/s: trunk
• Fix Version/s: 1.6.0
• Component/s: src
• Labels: tree-conflicts
• Assignee: Unassigned
• Reporter: Subversion Importer
• Created: 17/Nov/08 22:32
• Updated: 27/Oct/18 16:33
• Resolved: 10/Mar/09 15:22

Description

"Most horrendous failure" during update: some logs are (apparently)
not executed when closing a dir.  See the email thread at

   <http://svn.haxx.se/dev/archive-2008-11/0421.shtml>

Bug due to a flaw in the tree conflict design.  We use the loggy
entry-modify command to write tree conflicts in a parent dir's
entry.  Tree conflicts caused by incoming deletions are written
(loggily) right away, but other tree conflicts are written upon
closing the parent dir.  Unfortunately, loggy commands are not
commutable.  Each succeeding modify-entry command overwrites
the previous one, leaving only one tree conflict when update is
done.

A proposed solution is to create a new add-tree-conflict loggy
command that will commute properly (i.e., each successive
command will append to existing t-c data instead of overwriting).

Original issue reported by sbutler