Moin Daniel,
> 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.
A branch can be used after --reintegrate, but why make life more
complicated?
http://stackoverflow.com/questions/3309602
> 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?
It shouldn't be the same URL. Append a number you increment each time
around:
* branches/hubbel
* branches/hubbel-2
* branches/hubbel-3
> 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.
Subversion (or any other VC system, for that matter) cannot fully
substitute inter-developer communication. Just use a mail distribution
list or whatever works for you.
Michael
Received on 2010-12-09 16:52:04 CET