Ryan Schmidt wrote:
> You don't want to merge the changes between trunk@100 and the branch@200
> -- that would also try to reapply the changes that occurred on the trunk
> between r100 and r200, which this working copy of trunk at r200 should
> already contain.
You are partly right; I'd assumed my coworker was merging properly
because his log messages matched up, but it turns out he accidentally
documented the wrong merge revision in his logs. Oops!
The problem still exists with the correct revision numbers, though. The
problem seems to be that when we merge the trunk into the branch,
sometimes the files end up marked as modified instead of merged, and I'm
not sure why. Here's an example:
> C:\Projects\Hegemony.rob\Release\Resources\Images\UV>svn merge -r 4930:5144 http://bender.ldastore.com/svn/Hegemony/trunk/Release/Resources/Images/UV
> D Gate04.tga
> D Gate01.dds
> D Phalangist03.tga
> U Phalangite04.tga
> U Commander02Bump.tga
> A ShieldBump.tga
> U CityCluster01Bump.tga
> A Worker02Bump.tga
> U CityCluster02Bump.tga
> U shield_24.tga
> D Banners\IllyrianBanner.tga
> D Banners\AthenianBanner.tga
> D Banners\PaeonianBanner.tga
> D Banners\IndependentBanner.tga
> D Banners\MacedonianBanner.tga
> A Banners\BannerInde.tga
> A Banners\BannerThebesPhocis.tga
> A Banners\BannerElisMessenia.tga
> A Banners\BannerThessalyPherae.tga
> A Banners\BannerCorinthArgos.tga
> A Banners\BannerPaeoniaIllyria.tga
> D Banners\bannerbump.tga
> A Banners\bannerbump.tga
> A Banners\BannerEpirusAcarnania.tga
> A Banners\BannerPersiaCrete.tga
> A Banners\BannerArcadiaAchaea.tga
> A Banners\BannerBalkanDanube.tga
> A Banners\BannerMacedonAthens.tga
> A Banners\BannerSpartaAetolia.tga
> A Banners\BannerChalcidianThraceW.tga
> A Banners\BannerThraceCentEast.tga
> U Faces.tga
> A WallBump.tga
> A MigrantBump.tga
> U UnitBlood.tga
> U Phalangite04Bump.tga
> U Hoplite12.tga
> U Commander02.tga
> A Worker02.tga
> U Hoplite12Bump.tga
> U Shields.tga
> U Wall.tga
> A Migrant.tga
>
> C:\Projects\Hegemony.rob\Release\Resources\Images\UV>svn status
> A + ShieldBump.tga
> A + Worker02Bump.tga
> M CityCluster01Bump.tga
> M CityCluster02Bump.tga
> M shield_24.tga
> M Faces.tga
> A + MigrantBump.tga
> M Phalangite04Bump.tga
> M Commander02.tga
> M Shields.tga
> D Phalangist03.tga
> M Wall.tga
> M Phalangite04.tga
> D Gate04.tga
> M Commander02Bump.tga
> A + Banners\BannerInde.tga
> A + Banners\BannerThebesPhocis.tga
> A + Banners\BannerElisMessenia.tga
> A + Banners\BannerThessalyPherae.tga
> D Banners\IllyrianBanner.tga
> D Banners\AthenianBanner.tga
> A + Banners\BannerSpartaAetolia.tga
> D Banners\PaeonianBanner.tga
> A + Banners\BannerThraceCentEast.tga
> A + Banners\BannerChalcidianThraceW.tga
> D Banners\IndependentBanner.tga
> D Banners\MacedonianBanner.tga
> A + Banners\BannerCorinthArgos.tga
> A + Banners\BannerPaeoniaIllyria.tga
> R + Banners\bannerbump.tga
> A + Banners\BannerEpirusAcarnania.tga
> A + Banners\BannerPersiaCrete.tga
> A + Banners\BannerArcadiaAchaea.tga
> A + Banners\BannerBalkanDanube.tga
> A + Banners\BannerMacedonAthens.tga
> D Gate01.dds
> A + WallBump.tga
> M UnitBlood.tga
> M Hoplite12.tga
> A + Worker02.tga
> M Hoplite12Bump.tga
> A + Migrant.tga
Unless I'm wrong, all of those files with an M next to them should have
an R next to them.
-Rick-
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Thu Mar 15 03:29:46 2007