svn is giving me grief, I'm merging and getting:
mrs $ svn cp -r113703 svn+ssh://src.apple.com/svn/fsf-gcc/gcc/
branches/apple-local-200502-branch/gcc/testsuite/g++.dg/
bitreverse-10.C bitreverse-10.C
svn: Entry for 'bitreverse-10.C' exists (though the working file is
missing)
mrs $ svn add bitreverse-10.C
svn: warning: 'bitreverse-10.C' not found
mrs $ touch bitreverse-10.C
mrs $ svn add bitreverse-10.C
A bitreverse-10.C
mrs $ svn cp -r113703 svn+ssh://src.apple.com/svn/fsf-gcc/gcc/
branches/apple-local-200502-branch/gcc/testsuite/g++.dg/
bitreverse-10.C bitreverse-10.C
svn: File 'bitreverse-10.C' already exists
mrs $ svn rm --force bitreverse-10.C
D bitreverse-10.C
mrs $ svn cp -r113703 svn+ssh://src.apple.com/svn/fsf-gcc/gcc/
branches/apple-local-200502-branch/gcc/testsuite/g++.dg/
bitreverse-10.C bitreverse-10.C
svn: Entry for 'bitreverse-10.C' exists (though the working file is
missing)
How do I `fix' this. I know how to fix it with multiple checkins,
don't want to do that, if I can avoid that. I can't seem to find a
spelling that works. :-( In cvs, this just works. :-(^2.
