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

Re: merge, new directories and files

From: Ryan Schmidt <subversion-2006Q1_at_ryandesign.com>
Date: 2006-02-23 20:35:02 CET

On Feb 23, 2006, at 19:45, Andrew Brosnan wrote:

> I want to merge all changes in a trunk into a previously created
> branch.
> When I do a dry-run I get several 'Skipped missing target:' messages
> anytime files were added in a new directory. Example:
>
> svn merge --dry-run -r 145:290 svn+ssh://url/to/trunk/project
> ...
> A html/images/horoscope/n
> Skipped missing target: html/images/horoscope/n/Cancer.gif
> Skipped missing target: html/images/horoscope/n/Scorpio.gif
> Skipped missing target: html/images/horoscope/n/Leo.gif
> ...
>
> The directory gets added ok, why not the files? How do I handle this?

Make sure your working copy has no changes and is up-to-date (so
that, if the next step doesn't work, you can "svn revert -R" the
whole thing). Then try the exact same command without the --dry-run
parameter. Does it work? IMHO --dry-run is kinda busted in cases like
this which is why I never use it.

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Thu Feb 23 20:42:45 2006

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