On Wed, Jul 04, 2012 at 10:25:00AM -0000, rhuij...@apache.org wrote: > Author: rhuijben > Date: Wed Jul 4 10:24:58 2012 > New Revision: 1357214 > > URL: http://svn.apache.org/viewvc?rev=1357214&view=rev > Log: > Make it an error to perform a text or property merge into an already > conflicted > node. We can't store two conflicts of the same kind on a node. > (And even if we could, it would be very hard to provide a UI to resolve the > conflict). > > 'svn merge' should probably provide some more user friendly handling for this > case. Just blocking merging into a somewhere conflicted tree currently breaks > a lot of tests, while it is certainly *not* best practice to merge into a > conflicted tree.
Can we add an --allow-conflicts switch that overrides this new error, like we did for mixed-revisions? That might also make it easier to keep the merge tests passing by adding the new flag where appropriate.
