[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 16:08:52 CET

Ok, I just add this so maybe it can help someone someday:

> 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
> happens.
> 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!
This is because I tried running svn merge with --dry-run and as the help
explains, it doesn't perform any operation so an error like this:

svn merge --dry-run [...]

A foodir
Skipped missing target: foodir/my.gif

Is naturally correct since foodir isn't really added so all the entries
from foodir are unknown to the wc you are merging.


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 16:09:22 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.