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

Re: merge stops on file missing in working copy

From: Max Bowsher <maxb_at_ukf.net>
Date: 2004-08-17 21:07:26 CEST

Lorenz Lenhardt wrote:
> Hi all,
> I'm trying to port changes between to tags to my working copy.
> My problem here is that some of the original files got removed from my wc
> (separate language files -> combined language file).
> If I now try to "svn merge <tag1> <tag2>" the process aborts on the first
> missing file returning the error message:
> svn: Use --force to override this restriction
> svn: '<file>' is not under version control
> Does anyone know a solution for that problem?

Need more detail.

I put together the attached script to model what you describe, and simply
got "Skipped missing target" - no error.


To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org

Received on Tue Aug 17 21:08:32 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.