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

branch should become new trunk

From: Werner F. Bruhin <werner.bruhin_at_free.fr>
Date: Tue, 12 Jan 2010 17:20:07 +0100

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".

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".

Do I need to do a final merge from trunk to branch?

Any hints or pointers to the relevant documentation would be very



To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2010-01-12 17:20:50 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.