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

Periodically merge between trunk->branch and branch->trunk

From: Daniel Albuschat <d.albuschat_at_gmail.com>
Date: Thu, 9 Dec 2010 12:46:14 +0100

Hello there,

I have to following use-case:

I'd like to create a branch from trunk and periodically merge trunk
into my branch to stay up to date with what happens in trunk.
At some point, the feature in my branch reaches a kind of stability
that is OK for trunk, so I merge it back to trunk.
The difference to the standard situation is that I want to continue
working on the branch, because the feature is not completely finished,
yet, or it needs further enhancement.
Currently the only solution I see is to reintegrate the branch to
trunk and then re-create the branch. This has the shortcoming that all
developers working on the branch have to switch to the new branch
(although it is the same URL) to be able to work with it, right? This
is ok when I'm working alone on my branch, but with a development
team, it becomes tricky to make sure that everyone properly switch to
the new branch.

Here's a drawing:

Kind regards,
Daniel Albuschat
Received on 2010-12-09 13:59:05 CET

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.