Re: Updating local-moves (was: svn commit: r1301390 ...)
From: Julian Foad <julianfoad_at_btopenworld.com>
Date: Fri, 16 Mar 2012 16:07:54 +0000 (GMT)
Here is what I'd like to see.
We choose some default behaviour, but we
Somebody mentioned months ago that the code would be cleaner if we would consistently treat every incoming change the same way. First store the incoming change, whatever it is, alongside the existing local change; then run a standard "conflict resolver callback" on it which in most cases would notice it's a trivial case and silently select the obvious resolution; and in any non-trivial case get the user's input. Then if the user wants all edit-vs-move potential conflicts to be resolved automatically, the user simply switches on the appropriate flag in the callback's baton by ticking a box in the GUI or passing a command-line option.
Then selection of a default behaviour becomes an almost orthogonal discussion with zero impact on the svn library implementation.
This is an archived mail posted to the Subversion Dev mailing list.