[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: Ryan Schmidt <subversion-2007a_at_ryandesign.com>
Date: 2007-03-14 08:50:21 CET

On Mar 13, 2007, at 12:33, Rick Yorgason wrote:

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

Eh... Well, even if there were a Subversion bug, you would be asked
to post to the users list, unless you are contributing actual code
changes to the Subversion project, or discussing code changes, or in
some other way contributing to the development of Subversion. Bug
reports though are handled on the users list, where if someone agrees
that it's a bug, you will be told that you may file an issue in the
issue tracker.

However, I don't think you've found a bug. :-) Read on:

> 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_at_5548 http://bender.ldastore.com/svn/Hegemony/
>> branches/rob@5596


> 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.

Let me see if I understood the situation accurately. You have a
trunk. And you have a branch that was created from the trunk at some
revision, let's say r100. And then independent development took place
on trunk and the branch, and now the HEAD is at, say, r200. You said
the feature branch is synchronized -- does this mean you have already
merged the changes from r100 to r200 of the trunk into the branch? If
so, then the branch at r200 is the same as the trunk at r200 except
that it contains the new feature. So the way that you would bring
this back into the trunk is to go into a working copy of the trunk at
r200 and merge in the changes between the trunk r200 and the branch

C:\Path\To\WorkingCopyOfTrunk>svn merge http://bender.ldastore.com/
svn/Hegemony/trunk_at_200 http://bender.ldastore.com/svn/Hegemony/

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.

To reply to the mailing list, please use your mailer's Reply To All  
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Wed Mar 14 08:50: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.