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

Re: Merge from branch to trunk

From: Ryan Schmidt <subversion-2008c_at_ryandesign.com>
Date: Thu, 4 Sep 2008 02:34:38 -0500

On Sep 4, 2008, at 2:12 AM, jiri.pejchal_at_gmail.com wrote:

> Ryan Schmidt writes:
>> On Sep 3, 2008, at 11:03 AM, jiri.pejchal_at_gmail.com wrote:
>>> we have a trunk with our application and two branches with the same
>>> application that has different database backends implemented (some
>>> files
>>> are different).
>>> I would like to keep the trunk and the two branches in sync except
>>> for those
>>> files that are different (about ten files).
>>> Ideally if trunk changes copy the changes to branch1 and branch2,
>>> if branch1 changes copy the changes to trunk and branch2,
>>> if branch2 changes copy the changes to trunk and branch1.
>>> (except those files that will always be different).
>>> Is it possible?
>>> What is the recommended procedure?
>> If you want to keep these as separate branches, then you will need to
>> periodically merge changes.
>> Personally I would recommend keeping everything together in one
>> consolidated version of the source, with e.g. (if it was written in
>> C) #ifdefs around the things that you want to be different between
>> the different versions.
> It's written in java. Hm, I thougt the branches and merging would
> be the
> right solution.

Merges are a bit tedious. :)

>>> Acording to the subversion book when I do:
>>> svn merge --reintegrate http://svn.example.com/repos/calc/branches/
>>> my-calc-branch
>>> in working copy of the trunk the branch is no longer usable for
>>> development.
>> That doesn't sound correct... What does the book say exactly?
> In Subversion 1.5, once a --reintegrate merge is done from branch to
> trunk, the branch is no longer usable for further work. It's not
> able to
> correctly absorb new trunk changes, nor can it be properly
> reintegrated
> to trunk again. For this reason, if you want to keep working on your
> feature branch, we recommend destroying it and then re-creating it
> from
> the trunk.

Hm. I see. Guess I hadn't read that part yet.

Well, I guess it just means you shouldn't use the --reintegrate
switch. You may need to do merges more manually, as they were done in
Subversion 1.4 and earlier.

To unsubscribe, e-mail: users-unsubscribe_at_subversion.tigris.org
For additional commands, e-mail: users-help_at_subversion.tigris.org
Received on 2008-09-04 09:35:07 CEST

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.