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.
If I now try to "svn merge <tag1> <tag2>" the process aborts on the first
svn: Use --force to override this restriction
Does anyone know a solution for that problem?
TIA Lorenz
PS: I tried to work around (not willing do merge every file separately)
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
Also there where empty *.tmp files generated for files in my wc that did not
|
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.