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

Re: Ancestry for dummies

From: Bob Hiestand <bob.hiestand_at_gmail.com>
Date: 2006-12-04 22:59:23 CET

On 12/4/06, Brown, Carlton <Carlton.Brown@bellsouth.com> wrote:
> 5 Merge changes from FeatureA/trunk into R2.0/trunk
>
> I noted the results, then repeated the tests with one change: Instead of
> re-baselining with "svn copy", I performed an export of R1.0 and imported it
> to R2.0. So they were still identical, yet all the ancestry had been
> discarded in R2.0

I don't think the ancestry matters in the merge target, only in the
sources. You are merging INTO R2.0, so the relative diff calculated
between FeatureA and R1.0 (I assume that's how you're doing it) works
fine (ie, they have shared ancestry in both merges you perform) and
doesn't care whether R2.0 shares ancestry.

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Mon Dec 4 23:00:03 2006

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