On 06.08.2012 20:23, Stefan Sperling wrote: > On Mon, Aug 06, 2012 at 07:09:11PM +0100, Julian Foad wrote: >> --reintegrate forces a 1.7 reintegrate, unconditionally, at the moment; I >> haven't put a deprecation warning in there. > In my opinion it would be best to try to keep --reintegrate and its > current behaviour around until 2.0, with a deprecation warning.
"2.0" is effectively "forever." Is that really necessary if at some point the merge algorithm becomes truly correct and doesn't require --reintegrate hacks? > If we change the behaviour of --reintegrate we might break existing scripts. We've broken scripts any number of times already. IMO --reintegrate just papers over a bug. The idea is to fix the underlying bug. I see nothing in our versioning rules that requires bug-for-bug backwards compatibility. -- Brane -- Certified & Supported Apache Subversion Downloads: http://www.wandisco.com/subversion/download
