[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Re: merging and switching

From: Karl Fogel <kfogel_at_newton.ch.collab.net>
Date: 2002-01-24 18:23:01 CET

Greg Hudson <ghudson@MIT.EDU> writes:
> People like to use names, not numbers.
>
> Because you're forgetting this rule, you're copying command syntaxes
> from CVS without accounting for the fact that in CVS, you can use branch
> and tag names for version numbers, whereas in Subversion you have to use
> paths.
>
> So, not only does merge need to handle two different URLs, so does
> diff. I pointed this out in
> http://subversion.tigris.org/servlets/ReadMsg?msgId=41945&listName=dev
> but, even though Karl answered in the positive and appeared to
> understand, I think my argument got lost in the noise.

+1 (I just forgot about that fact, thanks Greg)

In any case, the essential observation remains the same: we're doing
the same work for "svn diff" that we're doing for "svn merge", and
there will be a *lot* of duplicated code unless we take care to factor
them.

For example, Ben's question about whether we should just grab two
fulltexts to do merge, or do some fancy svndiffing to produce the
fulltexts on the client side... Whatever the answer is, there's no
reason for it to be one way for `diff' and another way for `merge'.
It's the same problem.

-K

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Sat Oct 21 14:36:59 2006

This is an archived mail posted to the Subversion Dev mailing list.

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.