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

RE: Confused about how to merge changes from branch to trunk

From: Ian L <misc_at_imerk.com>
Date: Wed, 25 Sep 2013 12:37:18 -0700 (PDT)

> > Thanks for the reply.
> >
> > If i try doing merge a range of revisions FROM trunk and do not specify a
> > range, it appears as though it wants to re-add every file in the project even
> > though only 20ish files have changed.
> How does it "appear" that way? It should only be merging stuff since your copy. It might say something about from r1 to HEAD, but it will only do what is needed.

I did several test merges. In doing a test merge where i don't specify the range of revision, it's showing every file in the project as 'added'. it's also showing tree conflicts.

> >
> > I select the revision range 155-158 it appears that it updated all the files that
> > the other dev changed. So it looks like the first part of your suggestion worked.
> You might also want to do a merge again, record only. However, I expect it won't make any changes.
> >
> > Now how do i get the changes in the branch back into trunk? Do i do a tree
> > merge and select my branch as the FROM, revision 160 (thats the revision just
> > after i committed the updated files from the merge FROM trunk) and the head
> > revision for trunk as the TO ?
> Um.. it depends on your TSVN version which you didn't indicate. You shouldn't do a tree merge... just a merge a range (1.8) or reintegration merge (1.7).

using 1.8.2

So after i've gotten the changes from trunk into my branch and i want to push everything back to trunk, i select merge range - and what do i put in the URL to merge from? I already merged from trunk once. And i don't see how i can merge from my branch since that would just be merging the branch into itself. It appears as though merging a range of revisions just merges them into my working copy.

Do i have to checkout a copy of the trunk? or switch my working copy over to trunk?



To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2013-09-25 21:37:25 CEST

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.