RE: I don't understand the merge command at all...

> > > 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

------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=1065&dsMessageId=2396031

To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_subversion.tigris.org].
Received on 2009-09-17 16:48:37 CEST