[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: Ryan Schmidt <subversion-2006d_at_ryandesign.com>
Date: 2006-11-28 05:22:49 CET

On Nov 27, 2006, at 13:32, Dmitri Colebatch wrote:

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

How about

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

svn merge -r 12045:17051 http://svn/tJunction/trunk/thirdparty/lib/
jaxb-2.0.3

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Tue Nov 28 05:23:32 2006

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