Re: Shelve & checkpoint - next steps
From: Julian Foad <julianfoad_at_apache.org>
Date: Sat, 19 May 2018 12:05:19 +0100
Julian Foad wrote on 2018-05-14:
Done in http://svn.apache.org/r1831884 . Some details follow.
> - 'mkdir', 'rmdir'
> - copy and move
> - properties with 'binary' content values
Done. (It uses the same code path as in 'update' and 'merge' so whatever exactly it does should be good enough.)
> - 3-way merge
> - conflict handling like in 'svn update' and 'svn merge'
Partly done, mostly TODO. Tree conflicts are not detected.
> - ... run 'diff' and pipe the result into 'patch' ..., for now
When I tried that, I ran into a bug in our 'diff' code when using it that way, and moved on to directly invoking 3-way merge at a low level (per file).
This is an archived mail posted to the Subversion Dev mailing list.