Daniel Shahaf wrote:
> The fact that all these representations are interchangeable suggests to
> me that they all have the same compatibility properties. [...]
>
> We need a format bump iff a db query in 1.10 wouldn't DTRT on a wc that
> 1.11 has touched. I don't see why shelves would introduce any instance
> of this — even if they add new DB tables.
>
> (I suppose 1.10 might purge pristines that are only used by shelves, but
> then, the worst-case is that somebody who uses 1.10 and 1.11 on the same
> working copy will need to re-fetch the pristine from the server.)
OK, if all the info goes into new db tables.
>>>> And it would be desirable to have a way to:
>>>>
>>>> * generate a diff from that storage, to output for review or as a patch.
>
> You mean, if we store shelves as unidiffs in .svn/shelves/, user can
> cp(1) them from there? I think it would be good to require users to run
> 'svn shelf --export-as-unidiff' to get a unidiff: it affords separation
> of concerns (between the user-facing functionality and the backing
> storage).
Fair comment.
> [...]
> My overall impression is that diff3 is the so called king's road here:
> it's designed for this and it's not all that more expensive than the
> alternative.
I agree in terms of the outcome. We'll need to see how expensive the
implementation task to get there would be.
Thanks,
- Julian
Received on 2017-08-29 11:24:13 CEST