RE: svn merge --reintegration.

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

Have you been applying stuff that was committed to trunk into the branch manually? If so, that would explain all the conflicts. If this is the case you just need to do a "record only" merge from trunk to branch. Once you have everything from trunk merged into the branch then you can do a reintegrate merge from branch into trunk. After that, assuming you want to continue work in the branch you can do a record only merge from trunk of the rev that contains the merge from branch. If you are not going to continue the branch you are advised to delete it.

If you haven't applied anything from trunk into the branch, then you should just be able to merge from the branch into the trunk.

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

Yes, it "knows" what has been merged from trunk to branch... as long as it was done with a merge, and not done manually... for example you made a change to trunk and committed it, then you made that same change to branch and committed it. In this case svn has no idea that this happened.

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

hth,
BOb
Received on 2010-09-21 16:54:26 CEST