Bob Archer wrote:
>> 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
>> 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
>> which I made in the mean time and were of interest from "branch"
>> been merged from "trunk" to "branch". In other word the state of
>> 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.
Copy how? Delete all in my trunk work copy, copy from branch work copy
to trunk work copy and commit - wouldn't that mess up SVN?
I kept on reading the svnbook
wonder if "merging a Whole Branch to Another" wouldn't be getting what I
want, even so I have to resolve what ever conflicts show up (which I
hoped would somehow be done automagically) - basically always take the
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2010-01-12 17:47:25 CET