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

Re: Merging feature branch into trunk transmits unchanged files

From: Rick Yorgason <rick_at_ldagames.com>
Date: 2007-03-22 09:06:31 CET

Rick Yorgason wrote:
> Actually, my problem is that it's still transferring the entire files
> over the wire when I merge back into the trunk.

Okay, so I'm attempting to reproduce this issue in a sandbox, and I've
noticed that problem I'm having goes away when I ignore ancestry.

Now, I understand the difference between noticing and ignoring ancestry
when the merge is a range of revisions along a straight path, but I
don't really understand how Subversion uses the ancestry when comparing
two branches. Can anybody explain it for me?


To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Thu Mar 22 09:06:38 2007

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

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