Re: merging and switching

On Wed, Jan 23, 2002 at 05:37:58PM -0600, Ben Collins-Sussman wrote:
> So, what method to use? And, do we need to stay flexible and
> accept 2 different urls?

well, as i said on IRC earlier, i can't come up with a use case that
would involve diffing two different branches and applying the results
to a third. it seems like two of the three things involved would just
be different revs of the same branch, and you'd be applying the
difference between them to another branch. (apply the difference
between rev 6 and 7 of branch foo to the trunk, since we fixed a bug
in that commit that still exists in the truck...)

even if we can come up with a use case for this, we should ask
ourselves 'how common is this', and 'how hard will it be to write'.
if it'll be difficult and not commonly used, then i don't see why we
shouldn't put it off until after 1.0.

as for the 'retrieve the full files and diff them' versus the more
complicated 'play tricks with diffs off our present wc to generate the
two versions to diff', it feels more right to take the second,
possibly more complicated route, since we've been trying to design for
low bandwidth where possible, and the brute force 'grab full text of
both files' approach just seems wrong. it's just a gut feeling
though, and since i'm not going to be writing this code, i really
don't have much say in how you do it.

looking forward to hearing everyone else's opinions on the matter,

-garrett

-- 
garrett rooney                     Unix was not designed to stop you from 
rooneg@electricjellyfish.net       doing stupid things, because that would  
http://electricjellyfish.net/      stop you from doing clever things.
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org