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

RE: Branch Merging Issue

From: Michael Cole <mcole_at_forbin.com>
Date: Thu, 12 Aug 2010 16:45:47 -0500

No, the trunk was not modified anywhere in the process except for the
reintegration in step 7. Did I need to merge the trunk into 1.2 after
step 7 to make 1.2 aware the trunk now also contains the 1.1 changes?

The tree errors were 1.2 trying to add files back into the trunk that
were already added from step 7. There weren't any changes made to the
files from 1.1 to 1.2.

-----Original Message-----
From: Bob Archer [mailto:Bob.Archer_at_amsi.com]
Sent: Thursday, August 12, 2010 10:28 AM
To: users_at_tortoisesvn.tigris.org
Subject: 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.



To unsubscribe from this discussion, e-mail:


To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2010-08-13 13:10:38 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.