[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Re: merge with new directory?

From: Bob Hiestand <bob.hiestand_at_gmail.com>
Date: 2006-11-27 16:20:59 CET

On 11/26/06, Dmitri Colebatch <dim@colebatch.com> wrote:
> After trying a few different things, including a suggestion received off
> list, all to no avail, I'm assuming this isn't possible.
>
> If I'm incorrect, please correct me.

Happily, I think I can.

> > I'm trying to merge changes from trunk to a branch that have a new
> directory and am not quite sure what to do. I have a directory
> thirdparty/lib/jaxb-2.0.3 which is on trunk and I want to copy (merge) it to
> mainline as it is required by some other changes that I have merged in.
> Here's what I'm trying:
> >
> > C:\1_1\tJunction\thirdparty\lib>svn merge -r 12044:17051
> http://svn/tJunction/trunk/thirdparty/lib/jaxb-2.0.3
> > svn: Unable to find repository location for '
> http://svn/tJunction/trunk/thirdparty/lib/jaxb-2.0.3 ' in
> revision 12044

The problem occurs because you are specifying the 'jaxb-2.0.3'
directory on the command line, which as you say does not exist in the
given revision. Even if it did, the command you are giving isn't
quite right, because it would merge the contents of the changes of
that directory into the current directory, which is 'lib' (in other
words, things would be displaced up one directory).

Try instead just using the corresponding source as your current
directory; that is, something like (from the 'lib' directory):

svn merge -r 12044:17051 http://svn/tJunction/trunk/thirdparty/lib

That should retrieve the directory creation as well as other changes
to the 'lib' directory and other subdirectories. Are you trying to
avoid pulling in such changes other than the directory creation?

Thank you,

Bob

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Mon Nov 27 16:21:59 2006

This is an archived mail posted to the Subversion Users mailing list.