svn merge --reintegration.

Hi Everyone,

I am having some issues with merging that I could use some advice on, please.

I have a trunk and a customer branch.
The decision has been made that all features belonging to the branch need to be added back into the trunk.

Changes have also been ongoing in the trunk too.

Is there a convenient method to place all changes from the branch to the trunk and the trunk to branch at the same time?

I tried merging from the trunk to the branch with;
svn merge http://....

But it basically told me there was a conflict with practically every file in every directory.
Is there something I'm missing or do I need to hand merge every conflict?

I was kind of hoping that it would be able to "know" that changes x, y, z andf have occurred on the trunk that have not been applied to the branch and only apply those changesets - which it technically may be doing...
but I am certain that there are files that are textually the same between two instances that are being listed in the output of the merge command.
Am I missing something?

I was thinking of creating a whole new branch (copying the trunk)
Merging from the branch into the new trunk,
Then merging the new trunk into the trunk.
It seems like it might like work ...

But I thought would check if there was a "simpler" option prior to heading down that path.

As Aways - thanks.

Gavin "Beau" Baumanis
E: gavinb_at_thespidernet.com
Received on 2010-09-21 05:45:44 CEST