Login | Register
My pages Projects Community openCollabNet

Discussions > users [DISABLED] > RE: can *never* use merge with --reintegrate

subversion
Discussion topic

There will be a brief maintenance window every Friday at 17:00 Pacific.
For further details, see CollabNet's maintenance and upgrade policy.

Back to topic list

RE: can *never* use merge with --reintegrate

Author pilotbob
Full name Bob Archer
Date 2009-10-12 09:23:05 PDT
Message > > I'm in Ubuntu and yes, the current directory is
>
> I was referring to the strange backslash in your command. It couldn't
> be a
> Windows path anyway, that would have to appear after the URL.
>
> >> Reintegration is a stage after "genuine" merging. First you have to
> merge
> >> /trunk into /branches/pat, commit that (which in this case will only
> send a
> >> svn:mergeinfo attribute). Then reintegration should work.
> >
> > OK, so what are the steps, really. I find the RedBean on this
> terrible.
>
> First prepare the branch for reintegration:
>
> svn co .../sandbox.../branches/pat pat
> cd pat
> svn merge .../sandbox.../trunk
> svn commit

You probably want to do an svn up here after the commit too.
 
> Then reintegrate:
> svn co .../sandbox.../trunk trunk
> cd trunk
> svn merge --reintegrate .../sandbox.../branches/pat
>
> --
> Stein

BOb

« Previous message in topic | 5 of 7 | Next message in topic »

Messages

Show all messages in topic

can *never* use merge with --reintegrate Pat Farrell <pfarrell at pfarrell dot com> Pat Farrell <pfarrell at pfarrell dot com> 2009-10-11 18:41:50 PDT
     Re: can *never* use merge with --reintegrate steinsomers Stein Somers 2009-10-12 08:47:29 PDT
         Re: can *never* use merge with --reintegrate Pat Farrell <pfarrell at pfarrell dot com> Pat Farrell <pfarrell at pfarrell dot com> 2009-10-12 08:52:07 PDT
             Re: can *never* use merge with --reintegrate steinsomers Stein Somers 2009-10-12 09:18:25 PDT
                 RE: can *never* use merge with --reintegrate pilotbob Bob Archer 2009-10-12 09:23:05 PDT
                     Re: can *never* use merge with --reintegrate steinsomers Stein Somers 2009-10-12 10:12:44 PDT
     Re: can *never* use merge with --reintegrate markphip Mark Phippard 2009-10-12 10:18:19 PDT
Messages per page: