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

Re: svn merge skips newly added files

From: Juan Alonso <jalonso_at_art3mis.com>
Date: 2004-02-05 12:26:21 CET

John Szakmeister wrote:

> On Thursday 05 February 2004 05:45, Juan Alonso wrote:
> If I understand your script correctly, you're trying to merge change from
> trunk/ into branches/1.0/. If that's the case, then you're arguments to
> merge are incorrect. It should read:
> svn merge file:///tmp/repos/branches/1.0 file:///tmp/repos/trunk
> When I do this I get the following:
> A bar
> A doodaa
> Merge works much the same way diff does. It looks at the first argument as a
> base, and then creates a patch to make it look like the second argument.
> Then it applies the patch to the working copy. With the merge command you
> provided, it created a patch using trunk/ as the base, and branches/1.0/ as
> the target. In this case, that would mean *removing* 'bar' and 'doodaa'.
> The message that you got below is Subversion saying, "Hey, this file is
> missing, so I'm not applying any changes to it." It's missing because it was
> never there in the first place. :-) You should take a look at the book, as
> it describes how to do these sorts of things very well:
> http://svnbook.red-bean.com/book.html#svn-ch-4-sect-3
>>Message I get:
>>Skipped missing target: bar
>>Skipped missing target: doodaa
>>$ /tmp/wc_branch_1.0$ svn --version
>>svn, version 0.33.0 (r7737)
>>Maybe the root of the problem is my old svn version?
> No, I don't think so. However, I would recommend upgrading. There have been
> a lot of bugs fixed since 0.33.0.
> -John

Ok, I think I understand now where the problem is. However, after double
checking the svn merge arguments in my real case it's still missing some
of the files. I will update svn and then I will try again and see what

The funny thing is that it adds new dirs but if the new dirs have new
files inside added on the same revision then svn refuses to add the files.

Thanks anyway, note to self: you never read the guide enought!

Juan Alonso Hernández
Jefe de Desarrollo y Sistemas
www.art3mis.com | (34) 91 530 16 33
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Thu Feb 5 12:26:44 2004

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

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.