Question about merging

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 could probably copy branch2 to branch2.1, get a diff between branch1_at_HEAD
and branch1.1_at_HEAD, then apply that diff to branch2.1 with patch, but it'd
be nice if some form of merge could handle that scenario.

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

To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2009-12-10 22:46:15 CET