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

RE: branch should become new trunk

From: Bob Archer <bob.archer_at_amsi.com>
Date: Tue, 12 Jan 2010 11:36:18 -0500

> I am confused on how to merge my "branch" back to the "trunk".
> I looked at some of the posts on the subject here and also at the
> svn
> book, but I am still not sure how to go about it.
> I created a branch when I was a revision 340, all the changes in
> "trunk"
> which I made in the mean time and were of interest from "branch"
> have
> been merged from "trunk" to "branch". In other word the state of
> the
> code in "branch" is to become the "final" result in "trunk".

Well, reinterate can only be used if you have merged ALL of trunk into branch. You can't cherrypick stuff from trunk into branch and then --reintegrate the branch. It's not gonna allow it or work.

> I am now at stage were "branch" should become the "new trunk", so I
> thought I should use "reintegrate branch", i.e. from URL = branch,
> working copy = trunk, but this gives me an error "Error:
> Reintegrate can
> only be used if revisions 340 through 802 were previously ...."
> when I
> do a "test merge".

If this is the result you want and you don't want to merge everything from trunk to branch you can just delete the trunk and then copy the branch to trunk. This will get you where you want to be.



To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2010-01-12 17:36:15 CET

This is an archived mail posted to the TortoiseSVN Users mailing list.

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.