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

merge stops on file missing in working copy

From: Lorenz Lenhardt <lenhardt_at_salvia-lifetec.de>
Date: 2004-08-17 12:46:50 CEST

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?

TIA Lorenz

PS: I tried to work around (not willing do merge every file separately)
using

        for %f in (*) do svn merge <tag1>/%f <tag2>/%f

That worked at least for the files already in my wc, but it would have
missed any changes in the directory structure, new files, etc.

Also there where empty *.tmp files generated for files in my wc that did not
exist in the repository. Seems to be a bug 8-)
Received on Tue Aug 17 17:22:56 2004

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