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

Re: short question about merge [PROPOSAL] vs. tree-deltas

From: Greg Stein <gstein_at_lyra.org>
Date: 2003-04-17 21:48:53 CEST

On Thu, Apr 17, 2003 at 12:08:34PM -0700, Tom Lord wrote:
>
> Let's say that I say: `svn merge ORIG MOD TGT'.
>
> The nested contents of MOD may be arbitrarily rearranged from ORIG.
>
> The merge algorithm has to look at the two trees and figure out what
> in ORIG corresponds to which in MOD. It has to know what has been
> renamed, and what to compare to what.
>
> In the general case, with absolutely no usage restrictions, this is
> basically impossible. Noderev ancestry, a hypothetical "perfect
> copy/rename history for each noderev" -- both give results that are
> either ambiguous, or that rely on disambiguation rules that are hard
> to control and mess up merging generally.[1]
>...
> [1] I can explain that in detail but wanted to keep this post short.

That huge email is based on a premise that you don't explain. You throw out
"this won't work", but without anything to back it up, and then go into a
long list of "which means this and that, and can't do this, and so the code
should do that."

I'm not sure that I agree with your premise, so it is impossible to evaluate
anything in the rest of your email.

Cheers,
-g

-- 
Greg Stein, http://www.lyra.org/
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Thu Apr 17 21:49:09 2003

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