On Tue, Jun 26, 2012 at 10:21 AM, <[email protected]> wrote: > Author: stsp > Date: Tue Jun 26 14:21:18 2012 > New Revision: 1354029 > > URL: http://svn.apache.org/viewvc?rev=1354029&view=rev > Log: > Remove some redundant local variables. We're now effectively always postponing > conflict resolution until after an update/switch/merge has completed. > > The intent of resolving conflicts during an operation for 1.5 API users > won't work anyway, since our backwards compat wrappers will always pass > a 1.7-style conflict_func2 which wraps a 1.5 conflict_func.
I'm unclear on this. It seems that if no conflict2_func is passed, then we can pass a wrapper for 1.7-style resolution during the operation. ie. stop hard-coding NULL and possibly provide a wrapper for the 1.5 API. (not sure what we'd do for 1.6 and 1.7, but it seems pretty clear we could support 1.5 and before) >... Cheers, -g
