Re: svn merge --reintegrate trouble again

On Wed, Mar 4, 2009 at 2:17 PM, Reid Priedhorsky <reid_at_umn.edu> wrote:

> Thanks for your help earlier. I ran into trouble again with svn merge
> --reintegrate, under 1.5.5 on Ubuntu Linux. Hopefully this additional
> detail will help.
>
> Summary: svn merge --reintegrate generates a lot of conflicts, but plain
> svn merge generates none.
> $ svn merge --accept postpone $svnroot/br/masli_ib-misc_820
> --- Merging r9696 through r9738 into '.':
> U    flashclient/Conf.as
> U    flashclient/tools/Node_Build.as
> U    flashclient/commands/Vertex_Add.as
> U    flashclient/commands/Node_Build.as
> U    flashclient/G.as

This is not a comparison to what --reintegrate does. BTW, if you have
not done any merges into the branch this is a perfectly acceptable way
to merge the branch back to trunk.

It sounds as if somehow the branch history is not right, or being
retrieved right. Was the branch created with svn copy? From what
revision of trunk? Was it possibly created from a mixed-revision WC
of trunk?

Let's assume the branch was created by copying trunk at rN. Then the
merge command to simulate reintegrate would be:

$ svn merge $svnroot/trunk_at_N $svnroot/br/masli_ib-misc_820_at_HEAD

All that --reintegrate does is calculate what "N" should be and then
run the above command. Everything else it does is just validations
before running the merge to determine if maybe this is not what you
want to do.

-- 
Thanks
Mark Phippard
http://markphip.blogspot.com/
------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=1065&dsMessageId=1272628
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_subversion.tigris.org].