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 steinsomers
Full name Stein Somers
Date 2009-10-12 10:12:44 PDT
Message >> 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.

And a "cd .." before going over to the trunk working copy.

--
Stein

« Previous message in topic | 6 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: