[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 00:17:08 CET

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.


On 11/24/06, Dmitri Colebatch <dim@colebatch.com> wrote:
> Hi all,
> 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
> This error message is correct. There was no jaxb-2.0.3 in revision
> 12044. It was added in 16714.
> In http://svnbook.red-bean.com/nightly/en/svn.branchmerge.copychanges.html#svn.branchmerge.copychanges.specific
> under "why not use patches instead" it says that what I'm trying to do is
> possible so I'm a little confused by the above.
> I could of course do svn merge -r 12044:17051
> http://svn/tJunction/trunk/thirdparty/lib but that brings in other changes
> I don't want. Any suggestions?
> cheers
> dim
Received on Mon Nov 27 00:17:49 2006

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