Julian Foad schrieb am Thu, 11 Apr 2013 20:59:56 +0100 (BST):
>> [...] the problem is that [...] no conflict is _detected_ at all.
> I agree that this behaviour is not good when you want strict
> conflict detection.
> This particular behaviour is just one of several heuristics in
> Subversion that aim to help the more casual user by producing a
> 'fairly obvious' output instead of being strict and flagging a
> conflict. These heuristics include:
Thank you for this valuable information.
> In my
> opinion, the user need to be able to specify either 'strict' mode or
> 'guess what I probably want' mode, since both modes are useful in
> different situations. The 'strict' mode should disable *all* of
> those heuristics and cause a conflict to be raised in those cases.
That would be indeed perfectly suitable for us, I think.
> Of course in 'strict' mode it will be useful for Subversion to offer
> an easy way for the user to select the 'obvious' resolution for the
> conflict, but the more important thing is to be able to detect such
> So I would like us to implement such a mode.
> The simplest implementation would have a single mode flag that just
> selects 'strict' or 'not strict'. A slightly more sophisticated
> implementation could have a bunch of flags that individually control
> the various heuristics, and probably a top-level control to easily
> switch them all on or all off. Either way, this would be a
> significant improvement.
Yes, and at least in our case, I assume a simple "strict" flag would
Received on 2013-04-11 22:36:18 CEST