[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: Dmitri Colebatch <dim_at_colebatch.com>
Date: 2006-11-27 20:32:40 CET

Hi Bob,

Thanks for the reply. My comments inline.

On 11/28/06, Bob Hiestand <bob.hiestand@gmail.com> wrote:
> 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?

The problem is that there have been other changes to the lib directory that
I don't want to pull in. ie other jars directory under lib, as well as
other directories under lib have been changed/added in that range, and I'm
not interested in those changes.

I did try this initially, but there's just way too many other changes for it
to be handled nicely.

Received on Mon Nov 27 20:33:31 2006

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