Re: Shelve & checkpoint - next steps

Julian Foad wrote on 2018-05-14:
> I propose now switching completely from 'patch' storage to storing whole
> files, and storing both the base and the working version of each shelved
> file.

Done in http://svn.apache.org/r1831884 . Some details follow.

> - 'mkdir', 'rmdir'

Done.

> - copy and move

TODO.

> - properties with 'binary' content values
> - files not recognized as 'binary' but that don't diff/patch nicely

Done. (It uses the same code path as in 'update' and 'merge' so whatever exactly it does should be good enough.)

> - 3-way merge

Done.

> - 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).

- Julian
Received on 2018-05-19 13:05:23 CEST