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

You said:
> 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?

I think you do. As a general rule.. in order to use reintegrate all changes from the target path need to be merged into the branch.

It may be that reintegrate doesn't handle what you want it to do.... while /trunk is an ancestor of 1.2 branch you actually copied the 1.2 branch from 1.1.

You may need to run the merges from 1.2 into 1.1, then reintegrate from 1.1 into trunk.

As I say... I'm not 100% sure... I would have to set up a test repo with the situation and try it.

This One reason why we restructured our repository so we don't have a trunk... we only merge from older to newer version paths... and use reintegrate for feature branches only.

>
> 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.

Hmm... I really think to understand it I would have to try it myself on a test system. I suggest you do that and see if it works.

Also... this subject is really not TSVN specific and you make get more knowledgeable help on the svn users list. Perhaps you can post this thread over there.

(please stop top posting)

BOb

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

To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2010-08-13 16:31:37 CEST