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

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

From: Stanimir Stamenkov <s7an10_at_netscape.net>
Date: Tue, 14 Dec 2010 00:06:47 +0200

Mon, 13 Dec 2010 07:33:07 +0100, /Daniel Albuschat/:
> 2010/12/11 Stanimir Stamenkov <s7an10_at_netscape.net>:
>> Thu, 9 Dec 2010 12:46:14 +0100, /Daniel Albuschat/:
>>> 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?
>> No, they need just to update their working copies to the latest
>> revision (now a fresh copy off trunk) of the branch. Of course
>> others should no commit in between the reintegration and the branch
>> re-creation.
> first, thanks for all the responses.
> I've dug thru the docs and some other web resources and came to the
> same conclusion as Stanimir;
> it works, basically, but you lose your history. This is, to our team,
> an absolute no-go, so we will have to refrain from using this
> technique.

How do you exactly loose your history?

> If the switch is really not needed and a normal update works, this
> would be perfect. Then the only "problem" that persists is telling
> every developer not commit to the branch - but that should be no
> problem.
> Again, thanks for the help to everyone.

Received on 2010-12-13 23:07:32 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.