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

Re: Issue 2897 revisited. Really.

From: Ph. Marek <philipp.marek_at_bmlv.gv.at>
Date: 2007-11-30 08:32:56 CET

On Donnerstag, 29. November 2007, Kamesh Jayachandran wrote:
> This may not work out in the following scenario,
> - Create /fb from /trunk
> - merge -r51from /trunk to /fb This results in a reflective commit r60
> Now if merge /fb to /trunk working copy if we take the special diff
> approach of applying (/trunk@59 ~ /fb@60) it can give rise to a false
> result as /fb does not have all the changes from /trunk but only the r51.
How about this ...

We know that r60 is the reflection of r51.
So, to merge fb to trunk, we have to take the diffs trunk@SOURCE:fb@59 (all
earlier changes), the reverse of trunk@51, and then fb@59:fb@HEAD ...

Like I said, it reminds me of symbolic arithmetic ... If you have the
(unknown) change somewhere, you ("just" :-) have to find a way to eliminate
it (or the possibly-double parts).

Does that work? Does that help? Don't know; there might be some pitfalls in
there.

Regards,

Phil

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Fri Nov 30 08:33:10 2007

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