RE: Branch Merging Issue

> That's kind of what I was thinking too. Just wanted to provide
> more details about my situation:
>
> 1) Created 1.1 branch from trunk.
> 2) Modified 1.1 branch.
> 3) Created 1.2 branch from 1.1 branch.
> 4) Modified 1.2 branch.
> 5) Modified 1.1 branch.
> 6) Merged changes from 1.1 to 1.2.
> 7) Reintegrated 1.1 back into trunk.
> 8) Make more changes to 1.2
> 9) Attempt to reintegrate 1.2 into trunk failed.
>
> I was assuming I was missing a fundamental step such as notifying
> 1.2 somehow that 1.1 had been integrated. 1.1 added several new
> items to the trunk, and when I reintegrated 1.2 I got tree errors
> because it seemed to be trying to re-add those new items.

What you are missing is... (but I assumed you did it or you would get errors when doing reintegrate)

6.5) Merge trunk into 1.1 branch

8.5) Merge trunk into 1.2 branch

Well... did you make modifications to the tree in 1.2? What were the tree errors? Perhaps they were legit.

BOb

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

To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2010-08-12 17:28:34 CEST