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

Merging feature branch into trunk transmits unchanged files

From: Rick Yorgason <rick_at_ldagames.com>
Date: 2007-03-13 18:33:14 CET

Hello Subversioners,

I'm posting this in users instead of dev in hopes that this is our fault
and not yours ;)

I'm one of two programmers at a small game company and we use Subversion
for all our code and art assets. Because of this, it means our trunk is
very big; a checked out copy is 7.61 GB (including .svn files), with a
lot of binary files.

We use branches to avoid breaking the other programmer's code while
still being able to backup our changes and occasionally work from home,
so this is a typical feature branch pattern.

Unfortunately, when we merge the synchronized feature branch into the
trunk, it seems to transmit files which haven't actually been changed.
For instance, branches/rob merged with trunk@5548 at revision 5596, and
when I merge, I get...

> C:\Projects\Hegemony.test>svn merge http://bender.ldastore.com/svn/Hegemony/trunk@5548 http://bender.ldastore.com/svn/Hegemony/branches/rob@5596
> U Release\Launcher.exe
> U Release\Hegemony.exe
> U Release\Hegemony Web Site.URL
> D Release\Resources\Entities\Brigades\Generic Land Caravan.xnt
> A Release\Resources\Entities\Brigades\Generic Land Caravan.xnt
> U Release\Resources\Entities\Brigades\formations\catapult formations.xnt
> U Release\Resources\Entities\Brigades\Macedonian Military Brigades.xnt
> U Release\Resources\Entities\Brigades\Generic General Brigade.xnt
> U Release\Resources\Entities\Brigades\Generic Catapult Brigade.xnt
> D Release\Resources\Entities\Brigades\Generic Sea Caravan.xnt
> A Release\Resources\Entities\Brigades\Generic Sea Caravan.xnt
> U Release\Resources\Entities\Units\Catapult Unit.xnt
> D Release\Resources\Entities\Meshes\Farm02.ent
> D Release\Resources\Entities\Meshes\Farm.ent
> U Release\Resources\Entities\Meshes\Peltast\PeltastLowerRes.xnt
> U Release\Resources\Entities\Meshes\Peltast\PeltastLowestRes.xnt
> A Release\Resources\Entities\Meshes\General\GeneralMini.xnt
> U Release\Resources\Entities\Meshes\WallRoughShorter.xnt
> D Release\Resources\Entities\Meshes\Banners\Banner01.xnt
> A Release\Resources\Entities\Meshes\Banners\Banner01.xnt
> U Release\Resources\Entities\Meshes\FarmFence.xnt
> U Release\Resources\Entities\Meshes\PotCratePile.xnt
> A Release\Resources\Entities\Meshes\Brazier.xnt
> D Release\Resources\Entities\Meshes\Particles\brazier fire particles.xnt
> A Release\Resources\Entities\Meshes\Particles\brazier fire particles.xnt
> A Release\Resources\Entities\Meshes\Particles\javelinparticles.xnt
> D Release\Resources\Entities\Meshes\Particles\cropfireparticles.xnt
> A Release\Resources\Entities\Meshes\Particles\cropfireparticles.xnt
> D Release\Resources\Entities\Meshes\Particles\harvestparticles.xnt
> A Release\Resources\Entities\Meshes\Particles\harvestparticles.xnt
> D Release\Resources\Entities\Meshes\Particles\brigadedustparticles.xnt
> A Release\Resources\Entities\Meshes\Particles\brigadedustparticles.xnt
> D Release\Resources\Entities\Meshes\Particles\smokeparticles.xnt
> A Release\Resources\Entities\Meshes\Particles\smokeparticles.xnt
> D Release\Resources\Entities\Meshes\Particles\bloodparticles.xnt
> A Release\Resources\Entities\Meshes\Particles\bloodparticles.xnt
> D Release\Resources\Entities\Meshes\Particles\dustparticles.xnt
> A Release\Resources\Entities\Meshes\Particles\dustparticles.xnt
> A Release\Resources\Entities\Meshes\WallTowerRoughSmall.xnt
> U Release\Resources\Entities\Meshes\WallTower03.ent
> D Release\Resources\Entities\Meshes\Siege\BallistaWalk.ent
> D Release\Resources\Entities\Meshes\Siege\Ballista.ent
> D Release\Resources\Entities\Meshes\Siege\BallistaRun.ent
> D Release\Resources\Entities\Meshes\Siege\BallistaAttackRange1.ent
> D Release\Resources\Entities\Meshes\Siege\BallistaShuffle.ent
> D Release\Resources\Entities\Meshes\Siege\BallistaIdle.ent
> A Release\Resources\Entities\Meshes\Siege\BallistaHighRes.xnt
> A Release\Resources\Entities\Meshes\WallTowerRough.xnt
> U Release\Resources\Entities\Meshes\WallTowerSmall.ent
> D Release\Resources\Entities\Bones\Ballista\Temp.xnt
> U Release\Resources\Entities\Bones\Ballista\Idle.xnt
> U Release\Resources\Entities\Scenarios\campaign.xnt
> U Release\Resources\Images\Water\masks\watermask65537.dds
> U Release\Resources\Images\Water\masks\watermask65538.dds
> U Release\Resources\Images\Water\masks\watermask65539.dds
> U Release\Resources\Images\Water\masks\watermask131073.dds
> U Release\Resources\Images\Water\masks\watermask131074.dds
> U Release\Resources\Images\Water\masks\watermask131075.dds
> U Release\Resources\Images\Water\masks\watermask131076.dds
> U Release\Resources\Images\Water\masks\watermask131077.dds
> U Release\Resources\Images\Water\masks\watermask262146.dds
> U Release\Resources\Images\Water\masks\watermask262147.dds
> U Release\Resources\Images\Water\masks\watermask262148.dds
> U Release\Resources\Images\Water\masks\watermask196610.dds
> U Release\Resources\Images\Water\masks\watermask262149.dds
> U Release\Resources\Images\Water\masks\watermask196611.dds
> U Release\Resources\Images\Water\masks\watermask196612.dds
> U Release\Resources\Images\Water\masks\watermask196613.dds
> U Release\Resources\Images\Water\masks\watermask327684.dds
> U Release\Resources\Images\Water\masks\watermask196609.dds
> U Release\Resources\Images\Water\masks\watermask65540.dds
> U Release\Resources\Images\Water\masks\watermask65541.dds
> U Release\Resources\Images\textures\Pebbles005.bmp
> U Release\Resources\Images\GUI\MapGUI.tga
> U Release\Resources\Images\GUI\Portraits.tga
> D Release\Resources\Images\GUI\SelectBuildingFriendly.tga
> A Release\Resources\Images\GUI\SelectBuildingFriendly.tga
> U Release\Resources\Images\GUI\GUIIcons1.tga
> A Release\Resources\Images\Particles\woodsplinters2.dds
> A Release\Resources\Images\UV\FarmAndStockPiles.tga
> U Release\Resources\Images\UV\CityCluster01Bump.tga
> U Release\Resources\Images\UV\FortKeep_Ruins.tga
> U Release\Resources\Images\UV\Worker02Bump.tga
> U Release\Resources\Images\UV\CityCluster02Bump.tga
> U Release\Resources\Images\UV\shield_24.tga
> U Release\Resources\Images\UV\Temple08DecalLight.dds
> U Release\Resources\Images\UV\Horse02.tga
> U Release\Resources\Images\UV\MigrantBump.tga
> U Release\Resources\Images\UV\Phalangite04Bump.tga
> U Release\Resources\Images\UV\Villa03.tga
> U Release\Resources\Images\UV\Ballista.tga
> U Release\Resources\Images\UV\Sheep.tga
> U Release\Resources\Images\UV\Commander02.tga
> U Release\Resources\Images\UV\FortKeep.tga
> U Release\Resources\Images\UV\Shields.tga
> U Release\Resources\Images\UV\Temple09.tga
> U Release\Resources\Images\UV\Wall.tga
> U Release\Resources\Images\UV\Peltast06Bump.tga
> U Release\Resources\Images\UV\Phalangite04.tga
> U Release\Resources\Images\UV\Commander02Bump.tga
> U Release\Resources\Images\UV\FortKeepBump.tga
> U Release\Resources\Images\UV\UnitBlood.tga
> U Release\Resources\Images\UV\Library.tga
> U Release\Resources\Images\UV\Hoplite12.tga
> U Release\Resources\Images\UV\Peltast06.tga
> U Release\Resources\Images\UV\Worker02.tga
> U Release\Resources\Images\UV\Hoplite12Bump.tga
> U Release\Resources\Images\UV\Temple08.tga
> U Release\Resources\Images\UV\Migrant.tga
> svn: Could not save the URL of the version resource
> svn: Caught signal

I canceled because it will transmit over 2G of data if I let it go all
the way. Now, here's the files that have actually changed:

> C:\Projects\Hegemony.test>svn status
> M Release\Hegemony.exe
> R + Release\Resources\Entities\Brigades\Generic Land Caravan.xnt
> M Release\Resources\Entities\Brigades\formations\catapult formations.xnt
> M Release\Resources\Entities\Brigades\Macedonian Military Brigades.xnt
> M Release\Resources\Entities\Brigades\Generic General Brigade.xnt
> M Release\Resources\Entities\Brigades\Generic Catapult Brigade.xnt
> R + Release\Resources\Entities\Brigades\Generic Sea Caravan.xnt
> M Release\Resources\Entities\Units\Catapult Unit.xnt
> M Release\Resources\Entities\Meshes\Peltast\PeltastLowerRes.xnt
> M Release\Resources\Entities\Meshes\Peltast\PeltastLowestRes.xnt
> A + Release\Resources\Entities\Meshes\General\GeneralMini.xnt
> M Release\Resources\Entities\Meshes\WallRoughShorter.xnt
> R + Release\Resources\Entities\Meshes\Banners\Banner01.xnt
> M Release\Resources\Entities\Meshes\FarmFence.xnt
> M Release\Resources\Entities\Meshes\PotCratePile.xnt
> A + Release\Resources\Entities\Meshes\Brazier.xnt
> R + Release\Resources\Entities\Meshes\Particles\brazier fire particles.xnt
> A + Release\Resources\Entities\Meshes\Particles\javelinparticles.xnt
> R + Release\Resources\Entities\Meshes\Particles\cropfireparticles.xnt
> R + Release\Resources\Entities\Meshes\Particles\harvestparticles.xnt
> R + Release\Resources\Entities\Meshes\Particles\brigadedustparticles.xnt
> R + Release\Resources\Entities\Meshes\Particles\smokeparticles.xnt
> R + Release\Resources\Entities\Meshes\Particles\bloodparticles.xnt
> R + Release\Resources\Entities\Meshes\Particles\dustparticles.xnt
> A + Release\Resources\Entities\Meshes\WallTowerRoughSmall.xnt
> M Release\Resources\Entities\Meshes\WallTower03.ent
> D Release\Resources\Entities\Meshes\Farm02.ent
> D Release\Resources\Entities\Meshes\Siege\BallistaWalk.ent
> D Release\Resources\Entities\Meshes\Siege\Ballista.ent
> D Release\Resources\Entities\Meshes\Siege\BallistaRun.ent
> D Release\Resources\Entities\Meshes\Siege\BallistaAttackRange1.ent
> D Release\Resources\Entities\Meshes\Siege\BallistaShuffle.ent
> A + Release\Resources\Entities\Meshes\Siege\BallistaHighRes.xnt
> D Release\Resources\Entities\Meshes\Siege\BallistaIdle.ent
> A + Release\Resources\Entities\Meshes\WallTowerRough.xnt
> M Release\Resources\Entities\Meshes\WallTowerSmall.ent
> D Release\Resources\Entities\Meshes\Farm.ent
> M Release\Resources\Entities\Bones\Ballista\Idle.xnt
> D Release\Resources\Entities\Bones\Ballista\Temp.xnt
> M Release\Resources\Entities\Scenarios\campaign.xnt
> M Release\Resources\Images\Water\masks\watermask65537.dds
> M Release\Resources\Images\Water\masks\watermask65538.dds
> M Release\Resources\Images\Water\masks\watermask65539.dds
> M Release\Resources\Images\Water\masks\watermask131073.dds
> M Release\Resources\Images\Water\masks\watermask131074.dds
> M Release\Resources\Images\Water\masks\watermask131075.dds
> M Release\Resources\Images\Water\masks\watermask131076.dds
> M Release\Resources\Images\Water\masks\watermask131077.dds
> M Release\Resources\Images\Water\masks\watermask262146.dds
> M Release\Resources\Images\Water\masks\watermask262147.dds
> M Release\Resources\Images\Water\masks\watermask262148.dds
> M Release\Resources\Images\Water\masks\watermask196610.dds
> M Release\Resources\Images\Water\masks\watermask262149.dds
> M Release\Resources\Images\Water\masks\watermask196611.dds
> M Release\Resources\Images\Water\masks\watermask196612.dds
> M Release\Resources\Images\Water\masks\watermask196613.dds
> M Release\Resources\Images\Water\masks\watermask327684.dds
> M Release\Resources\Images\Water\masks\watermask196609.dds
> M Release\Resources\Images\Water\masks\watermask65540.dds
> M Release\Resources\Images\Water\masks\watermask65541.dds
> M Release\Resources\Images\GUI\MapGUI.tga
> R + Release\Resources\Images\GUI\SelectBuildingFriendly.tga
> A + Release\Resources\Images\Particles\woodsplinters2.dds
> A + Release\Resources\Images\UV\FarmAndStockPiles.tga
> M Release\Resources\Images\UV\Ballista.tga
> M Release\Resources\Images\UV\Peltast06.tga

As you can see, there's many files which are getting updated which never
actually changed, for instance, most of the Release\Resources\Images\UV\
directory.

Is there something we're doing wrong, or is this a shortcoming with
Subversion?

The server version we're running is 1.4.0, and the client is 1.4.3.

Cheers,

-Rick-

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