Re: Merge from branch to trunk

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.

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

---------------------------------------------------------------------
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 07:31:30 CEST