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

Merge from branch to trunk

From: <jiri.pejchal_at_gmail.com>
Date: Wed, 03 Sep 2008 18:03:03 +0200


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?

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.


Jiri Pejchal
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-03 18:10:58 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.