[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-15 05:33:39 CET

Jared Hardy wrote:
> Somebody correct me if I'm wrong, but I think files are only marked
> R(eplaced) if they have actually been deleted, and a new file put in
> their place, using the svn tools. All other "replacements" are just
> marked as M(odified), because SVN has no record of the replacement.

Oh, I see. Thanks for the clarification.

> This means that svn will try to create a diff between the old and new
> file, even if they're from totally different sources. In practice,
> this probably works out okay, because any two binary files of the same
> type probably have something in common, regardless of source (if only
> the header, or any trailing in-file metadata).

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

> C:\Projects\Hegemony.test\Release\Resources\Images\UV>svn merge http://bender.ldastore.com/svn/Hegemony/trunk/Release/Resources/Images/UV@5596 http://bender.ldastore.com/svn/Hegemony/branches/rob/Release/Resources/Images/UV@5596
> U CityCluster01Bump.tga
> U FortKeep_Ruins.tga
> U Worker02Bump.tga
> U CityCluster02Bump.tga
> U shield_24.tga
> U Temple08DecalLight.dds
> U Horse02.tga
> U MigrantBump.tga
> U Phalangite04Bump.tga
> U Villa03.tga
> U Ballista.tga
> U Sheep.tga
> U Commander02.tga
> U FortKeep.tga
> U Shields.tga
> U Temple09.tga
> U Wall.tga
> U Peltast06Bump.tga
> U Phalangite04.tga
> U Commander02Bump.tga
> U FortKeepBump.tga
> U UnitBlood.tga
> U Library.tga
> U Hoplite12.tga
> U Peltast06.tga
> U Worker02.tga
> U Hoplite12Bump.tga
> U Temple08.tga
> U Migrant.tga
> C:\Projects\Hegemony.test\Release\Resources\Images\UV>svn status
> C:\Projects\Hegemony.test\Release\Resources\Images\UV>

If I use TortoiseSVN it tells me that it transferred 116.46MB, (I don't
know if theres a way to tell the svn to output the total amount of data
transferred, but it takes about the same length of time) but all the
files together add up to 30.1MB, and no files were changed.

All these files were merged into the branch at some point between the
last time the branch was merged back into the trunk and this time. The
results of the merge are still exactly as expected, but it takes far
longer than it should to simply merge some source code elsewhere in the
tree back into the trunk.


To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Thu Mar 15 05:33:45 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.