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

Re: diff problems on win32

From: D S <dougcodes_at_gmail.com>
Date: 2004-11-30 18:28:46 CET

was able to work around this problem for diff by using "--diff-cmd
diff" to use gnu diff instead. that worked great. now, I'm trying to
do an update on a file w/ conflicts. I get the exact same error while
trying to read tmp files.

$ svn update
svn: Can't read file '.svn/tmp/stuff.txt.tmp.tmp': End of file found

this would lead me to believe it's something in the common I/O for SVN
on cygwin. my file has svn:eol-style = native. my cygwin is a fresh
install and my svn is a fresh install of svn 1.1.1 from cygwin as
well.

thoughts?

On Mon, 29 Nov 2004 15:42:34 -0500, D S <dougcodes@gmail.com> wrote:
> New to SVN...
>
> I'm having trouble running svn diff on simple text files using svn
> 1.1.1 on cygwin. I installed svn through cygwin so I'm assuming that
> it was properly built. I'm running svnserve 1.1.1 w/ FSFS on linux.
>
> I create a simple text file and put some text in it. I import this
> into the repository. I check this file out and edit it. When I try to
> do a diff on it, I get:
>
> svn: Can't read file '.svn/text-base/stuff.txt.svn-base': End of file found
>
> I did some googling on this and it looks like this is related to the
> CRLF/LF mismatch from windows to *nix. I used auto-props to set the
> svn:eol-style property to native for *.txt files on add and import. I
> confirm that the file is checked out w/ the property set correctly. Is
> this property not checked in reference to the svn-base copy used in
> the diff? Is the problem even related to this? most of the posts I've
> seen are pretty old and not directly related to this issue.
>
> Here's what I did:
>
> daxis@localhost /d/tmp/
> $ mkdir stuff
>
> daxis@localhost /d/tmp/
> $ cat > stuff.txt
> this file now has some stuff in it.
> more stuff on this line.
>
> daxis@localhost /d/tmp/
> $ cat stuff/stuff.txt
> this file now has some stuff in it.
> more stuff on this line.
>
> daxis@localhost /d/tmp/stuff
> $ svn import svn:/eagle/stuff -m"importing stuff"
> Adding stuff.txt
>
> Committed revision 4.
>
> daxis@localhost /d/tmp/stuff
> $ cd ..
>
> daxis@localhost /d/tmp/
> $ rm -rf stuff/
>
> daxis@localhost /d/tmp/
> $ svn co svn:/eagle/stuff
> A stuff/stuff.txt
> Checked out revision 4.
>
> daxis@localhost /d/tmp/
> $ cd stuff/
>
> daxis@localhost /d/tmp/stuff
> $ svn propget svn:eol-style stuff.txt
> native
>
> daxis@localhost /d/tmp/stuff
> $ cat > stuff.txt
> I have changed the stuff in this file.
>
> daxis@localhost /d/tmp/stuff
> $ cat stuff.txt
> I have changed the stuff in this file.
>
> daxis@localhost /d/tmp/stuff
> $ svn status stuff.txt
> M stuff.txt
>
> daxis@localhost /d/tmp/stuff
> $ svn diff stuff.txt
> svn: Can't read file '.svn/text-base/stuff.txt.svn-base': End of file found
>
> does anyone have any suggestions here?
>
> thanks
>
> doug
>

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Tue Nov 30 18:31:57 2004

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