subversion-users mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Ryan Schmidt <subversion-20...@ryandesign.com>
Subject Re: SVN Blame Returns Corrupt Data
Date Thu, 10 Oct 2013 18:27:23 GMT

On Oct 10, 2013, at 11:29, T.J. Perovich <tjperovich@gmail.com> wrote:

> I'm having trouble running svn blame on a particular file.  It's returning garbage.
> 
> In TortoiseBlame:
> 3341  TJP  ÿþO
> 3341  TJP  
> 
> In the command line:
> 3341        TJP  ■O
> 3341        TJP
> 
> 
> The file is 10.1k lines, not 2.  If I run the blame from revision 0 to 3341 it returns
the correct information. 
> 
> In WinMerge and TortoiseMerge, diffing the files shows about 10 lines changing between
3340 and 3341 (it was merge).  However, the command line diff shows the entire contents being
changed with spaces between every character. So "End Class" reads "E n d   C l a s s", etc..
 Diffing a merge post-rev# 3341 show the same spaces between every letter.  
> 
> svn diff -r 3341:3489 svn://.......
> 
> @@ -20032,7 +20058,7 @@
> 
>                   F i l l _ d d l L o c a t i o n ( )
>                   F i l l _ d d l C o u n t r y ( )  

Sounds like you've converted the file from UTF-8 to UTF-16.


> Another strange thing is it's marking these as lines 20,032 and 20,058.  But in Notepad++
they are lines 10,026 and 10,031.  The line numbers in pre-rev# 3341 diffs match up between
the Notepad++ and command line fine.

Sounds like the line endings changed as well.



Mime
View raw message