Login | Register
My pages Projects Community openCollabNet

Discussions > users [DISABLED] > RE: I don't understand the merge command at all...

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: I don't understand the merge command at all...

Author pilotbob
Full name Bob Archer
Date 2009-09-17 07:47:27 PDT
Message > > > I made some changes to B, tested them, then checked them in. Then
> I
> > > wanted to merge those changes back to branches/A. From my
> branches/A
> > > directory I then executed
> > >
> > > svn merge -r 972:973 http://svnhost/.../branches/B .
> >
> > You should have executed:
> >
> > svn merge http://svnhost/.../branches/B
>
> Sorry to be so dense, but that's not working for me either. I am in
> branches/A and want to merge from branches/B. From my shell window:
>
> % pwd
> /home/.../branches/B
> % svn merge http://svnhost:3690/​.../branches/B
> svn: Not enough arguments provided; try 'svn help' for more info
>
> Isn't there some easy way to tell svn to merge from the tip of branch
> B to the current directory?

Your pwd shoud be /home/.../branches/A when you run the merge command since that is your merge target folder.

BOb

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

Messages

Show all messages in topic

I don't understand the merge command at all... smontanaro Skip Montanaro 2009-09-02 12:40:53 PDT
     RE: I don't understand the merge command at all... pilotbob Bob Archer 2009-09-02 12:51:09 PDT
         RE: I don't understand the merge command at all... smontanaro Skip Montanaro 2009-09-17 07:33:15 PDT
             RE: I don't understand the merge command at all... pilotbob Bob Archer 2009-09-17 07:47:27 PDT
                 RE: I don't understand the merge command at all... smontanaro Skip Montanaro 2009-09-17 07:52:44 PDT
                     Re: I don't understand the merge command at all... ryandesign Ryan Schmidt 2009-09-17 08:29:02 PDT
                         RE: Re: I don't understand the merge command at all... smontanaro Skip Montanaro 2009-09-17 08:48:25 PDT
                             RE: Re: I don't understand the merge command at all... pilotbob Bob Archer 2009-09-17 08:57:36 PDT
                 RE: I don't understand the merge command at all... smontanaro Skip Montanaro 2009-09-17 08:14:26 PDT
                     Re: I don't understand the merge command at all... levyam Andy Levy 2009-09-17 08:37:47 PDT
Messages per page: