On Thu, 2005-11-03 at 20:29 -0500, Joern Rennecke wrote: > > What version of svn? > > The 1.3 release candidate. > > > What is the exact branch you are trying to diff?? > > I had checked out a copy of the sh-elf-4_1-branch, and used > svn merge to apply the patches from the last merge point to > the current mainline. This merge deleted the .cvsignore file > in my working copy, but svn diff still tries to reference it.
Well I did svn co svn+ssh://gcc.gnu.org/svn/gcc/branches/sh-elf-4_1-branch cd sh-elf-4_1-branch svn merge -r106276:106279 svn+ssh://gcc.gnu.org/svn/gcc/trunk . (rev 106276:106279 contains the change that will remove .cvsignore) [EMAIL PROTECTED]:/mnt/gccstuff/sh-elf-4_1-branch> svn diff -N Index: .cvsignore =================================================================== --- .cvsignore (revision 106478) +++ .cvsignore (working copy) @@ -1,32 +0,0 @@ -*-all -*-co -*-dirs -*-done -*-install-info -*-src -*-stamp-* -*-tagged -blockit -cfg-paper.info -config.status -configure.aux -configure.cp -configure.cps -configure.dvi -configure.fn -configure.fns -configure.ky -configure.kys -configure.log -configure.pg -configure.pgs -configure.toc -configure.tp -configure.tps -configure.vr -configure.vrs -dir.info -Makefile -lost+found -update.out -LAST_UPDATED which is what i expect. svn diff (without non-recursive) gives me all the .cvsignore files I tried this with both 1.4 (on my machine) and 1.3rc1 (directly on gcc.gnu.org) So uh, i'm not sure what to tell you. I need to be able to reproduce this to be able to fix it, so i need an exact set of command lines i can type to make this fail. --Dan