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

RE: Merge - Reintegrate branch

From: Bob Archer <bob.archer_at_amsi.com>
Date: Thu, 5 Feb 2009 10:03:41 -0500

> Firstly THX A LOT FOR THE ANSWER,
> so could you please tell me which command (and steps)should I call to
move
> my branch modifications to trunk, if one? Or should I just work on
files
> using BeyondCompare?

BTW: You need 1.5.x Server and Client to take advantage of these
directions.

You don't need bc to do this.

1. Make sure your trunk is updated and has no mods in it
2. Right click on the WC of your trunk and select TSVN -> Merge
3. Keep the default setting of "Merge a range of revisions" click Next
4. select your branch for the URL To Merge From
5. merge all changes in your branch back into your trunk just press
next.

> Another thing: can I move modification just from one file instead of a
> whole folder ?

You can select by revision, but not by file. Above after step 4 press
the "Show Log" button next to Revision Range to Merge From.
Select the revisions you want to merge.

Once you commit the merge merge properties will be added to trunk to
keep track of which revisions have been merged.

So, the next time you do this, it will only merge what hasn't been
merged. Also, if you want to cherrypick again it will grey out the
revisions that have already been merged.

> Thx in advance for time spending for me,
> ciao Jack

Your best bet is to set up a test or dummy project to test this out on.
That is what I did to figure out what was/would happen with the various
options.

BOb

------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=1107804

To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2009-02-05 16:05:25 CET

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