Login | Register
My pages Projects Community openCollabNet

Discussions > users [DISABLED] > Re: Weird merge problem

subversion
Discussion topic

Back to topic list

Re: Weird merge problem

Author Mike Meyer <mmeyer at lexmark dot com>
Full name Mike Meyer <mmeyer at lexmark dot com>
Date 2009-04-21 15:01:51 PDT
Message Ron Hunter-Duvar <ron.hunter-duvar​@oracle.com> wrote on 04/21/2009
05:51:06 PM:

>
>
> Bob Archer wrote:
> The last commit to trunk was r1003. The branch was made at r7232
>
> (based
>
> on "svn log --stop-on-copy") and worked on up to r12212 (the current
> head revision), then frozen. I checked out a clean working copy of
>
> trunk
>
> at r12212. From within the clean trunk working copy I did this
>
> command:
>
> svn merge -r 7232:12212 $REPOS/branch
>
>
> Don't you need to specify the branch folder???
>
> svn merge -r 7232:12212 $REPOS/branch/ThisBranchHere
>
> Usually you copy into a folder of branch when you do the branch. Don't
> you?
>
> What if you just try:
>
> svn merge $REPOS/branch
>
> if you are using svn 1.5 or newer it should figure out what revision
> range needs to be merged.
>
> That said... if you just want to move your branch as is to your trunk
> you can delete trunk and copy the branch to trunk.
>
> BOb
>
> When I said $REPOS/branch that was just short hand for the full url,
> svn://<repository​>/branches/<na​me-of-branch>. I know I got that part
> right (if I didn't, it would have made a much bigger mess, pulling
> in a bunch of old branches).
>
> I was working around the problem by deleting all the *.working and
> *.merge-left.r0 files and moving all the *.merge-right.r12212 files
> to their base names, and some other clean up (seems merge won't
> delete stuff that's in trunk but was deleted from branch). But I
> think your delete and copy is a much better solution. I'll do that
> instead. Thanks.

I don't like that solution - I feel like it mucks up the history of the
trunk. I'd do the merge with "--accept theirs-full" instead, which will do
what you did with the merge files - only automatically. The end result
will be the same, except for the history, so it's realy just a matter of
which you prefer.

        <mike
Attachments

« Previous message in topic | 4 of 6 | Next message in topic »

Messages

Show all messages in topic

Weird merge problem ronhd Ron Hunter-Duvar 2009-04-21 14:22:24 PDT
     RE: Weird merge problem pilotbob Bob Archer 2009-04-21 14:35:15 PDT
         Re: Weird merge problem ronhd Ron Hunter-Duvar 2009-04-21 14:51:53 PDT
             Re: Weird merge problem Mike Meyer <mmeyer at lexmark dot com> Mike Meyer <mmeyer at lexmark dot com> 2009-04-21 15:01:51 PDT
                 Re: Weird merge problem ronhd Ron Hunter-Duvar 2009-04-21 15:13:15 PDT
                     Re: Weird merge problem Mike Meyer <mmeyer at lexmark dot com> Mike Meyer <mmeyer at lexmark dot com> 2009-04-22 07:02:09 PDT
Messages per page: