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

RE: Question about merging

From: Bob Archer <bob.archer_at_amsi.com>
Date: Thu, 10 Dec 2009 17:08:53 -0500

> Say my repo looks like this:
>
> trunk -> branch1 -> branch1.1
> |
> '----> branch2
>
> Is there an easy way of getting the differences between branch1 and
> branch1.1 and merging them into branch2? Actually, I want to leave
> branch2
> as it is, and create a branch2.1 off of it that has the changes
> between
> branch1 and branch1.1. I.e., the diff between branch1 and branch1.1
> should
> be the same as the diff between branch2 and branch2.1 (barring
> things like
> conflicts that need to be resolved).

I think if you do a merge, merge from two different trees, then choose FROM the rev where branch1.1 was created and then the head of branch1.1 you will get that. All a merge does is do a diff between the from/to locations and apply that diff to the merge target.. (which in your case would be your branch2.1.

BOb

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

To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2009-12-10 23:09:11 CET

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