Return-Path: X-Original-To: apmail-subversion-users-archive@minotaur.apache.org Delivered-To: apmail-subversion-users-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id AEFC61032D for ; Thu, 10 Oct 2013 19:18:32 +0000 (UTC) Received: (qmail 4385 invoked by uid 500); 10 Oct 2013 19:18:31 -0000 Delivered-To: apmail-subversion-users-archive@subversion.apache.org Received: (qmail 4366 invoked by uid 500); 10 Oct 2013 19:18:31 -0000 Mailing-List: contact users-help@subversion.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Delivered-To: mailing list users@subversion.apache.org Received: (qmail 4359 invoked by uid 99); 10 Oct 2013 19:18:31 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 10 Oct 2013 19:18:31 +0000 X-ASF-Spam-Status: No, hits=1.5 required=5.0 tests=HTML_MESSAGE,RCVD_IN_DNSWL_LOW,SPF_PASS X-Spam-Check-By: apache.org Received-SPF: pass (nike.apache.org: domain of tjperovich@gmail.com designates 209.85.160.42 as permitted sender) Received: from [209.85.160.42] (HELO mail-pb0-f42.google.com) (209.85.160.42) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 10 Oct 2013 19:18:25 +0000 Received: by mail-pb0-f42.google.com with SMTP id un15so3050515pbc.1 for ; Thu, 10 Oct 2013 12:18:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:in-reply-to:references:from:date:message-id:subject:to :cc:content-type; bh=j0E8F/G8yl3aJKTLrdlmsVR9PxuH+aFFYDL/VB8EKSs=; b=U3coRbvPFMvXU+QIl4F945lknFRYe1tF8do6eYbXyxtZgqfwPHKm3ctrw8PNYVDERu GJisKmqGUrI2UYfGXexQHQ2/HGuQUO6XSwqGfClGavazppRiZaS/gbRyim6j2WYahR0N gGI8OgzE60kVXT3SPJwiAbfudmE3HHzhYkVY9Pck4o1eCgNhxC8KIBsfhHL5daGhZXGO i1lJJzMWmqpJHwCO8fwzRddsrE4RRTjBhaz/InQ83h8topvDgajg9adUz+J8CIGp4Ehy diLE/UujSmBkCUKOObxGyNUBmskN0F+RoBpfG7M+VH9sZPN9BCeHCrSOEUXfGVqLGhKW QEnA== X-Received: by 10.68.162.5 with SMTP id xw5mr15813842pbb.71.1381432684182; Thu, 10 Oct 2013 12:18:04 -0700 (PDT) MIME-Version: 1.0 Received: by 10.70.63.37 with HTTP; Thu, 10 Oct 2013 12:17:24 -0700 (PDT) In-Reply-To: References: From: "T.J. Perovich" Date: Thu, 10 Oct 2013 15:17:24 -0400 Message-ID: Subject: Re: SVN Blame Returns Corrupt Data To: Bob Archer Cc: Ryan Schmidt , "users@subversion.apache.org" Content-Type: multipart/alternative; boundary=047d7b86d7766c023e04e867dc30 X-Virus-Checked: Checked by ClamAV on apache.org --047d7b86d7766c023e04e867dc30 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable On Thu, Oct 10, 2013 at 2:27 PM, Ryan Schmidt < subversion-2012c@ryandesign.com> wrote: >Sounds like you've converted the file from UTF-8 to UTF-16. Thanks, you're absolutely right. It changed from UTF-8 to UTF-16LE. Any idea how to go about fixing it elegantly? We have about 3 months of commits since this happened. Diff's in the GUIs have been working fine and we don't blame too often which is why it was never noticed. On Thu, Oct 10, 2013 at 3:15 PM, Bob Archer wrote: > > On Oct 10, 2013, at 11:29, T.J. Perovich wrote: > > > > > I'm having trouble running svn blame on a particular file. It's > returning > > garbage. > > > > > > In TortoiseBlame: > > > 3341 TJP =C3=BF=C3=BEO > > > 3341 TJP > > > > > > In the command line: > > > 3341 TJP =E2=96=A0O > > > 3341 TJP > > > > > > > > > The file is 10.1k lines, not 2. If I run the blame from revision 0 t= o > 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-re= v# > > 3341 diffs match up between the Notepad++ and command line fine. > > > > Sounds like the line endings changed as well. > > > > Sigh... if only svn would support Unicode encodings. > > BOb > > --047d7b86d7766c023e04e867dc30 Content-Type: text/html; charset=UTF-8 Content-Transfer-Encoding: quoted-printable
On Thu, Oct 10, 2013 at 2:27 PM, Ryan Schmidt=C2=A0<subversion-2012c@ryandesign.com>=C2=A0wrote:
>Sounds like you've converted the file from UTF-8 to UTF-16.

Thanks, you&#= 39;re absolutely right. =C2=A0It changed from UTF-8 to UTF-16LE. =C2=A0

Any idea how to go about fixing it ele= gantly? =C2=A0We have about 3 months of commits since this happened. =C2=A0= Diff's in the GUIs have been working fine and we don't blame too of= ten which is why it was never noticed.


On Thu,= Oct 10, 2013 at 3:15 PM, Bob Archer <Bob.Archer@amsi.com>= wrote:
>= 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. = =C2=A0It's returning
> garbage.
> >
> > In TortoiseBlame:
> > 3341 =C2=A0TJP =C2=A0=C3=BF=C3=BEO
> > 3341 =C2=A0TJP
> >
> > In the command line:
> > 3341 =C2=A0 =C2=A0 =C2=A0 =C2=A0TJP =C2=A0=E2=96=A0O
> > 3341 =C2=A0 =C2=A0 =C2=A0 =C2=A0TJP
> >
> >
> > The file is 10.1k lines, not 2. =C2=A0If I run the blame from rev= ision 0 to 3341 it
> returns the correct information.
> >
> > In WinMerge and TortoiseMerge, diffing the files shows about 10 l= ines
> changing between 3340 and 3341 (it was merge). =C2=A0However, the comm= and
> line diff shows the entire contents being changed with spaces between<= br> > every character. So "End Class" reads "E n d =C2=A0 C l= a s s", etc.. =C2=A0Diffing a merge
> post-rev# 3341 show the same spaces between every letter.
> >
> > svn diff -r 3341:3489 svn://.......
> >
> > @@ -20032,7 +20058,7 @@
> >
> > =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 F = i l l _ d d l L o c a t i o n ( )
> > =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 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 a= nd 20,058. =C2=A0But in
> Notepad++ they are lines 10,026 and 10,031. =C2=A0The line numbers in = pre-rev#
> 3341 diffs match up between the Notepad++ and command line fine.
>
> Sounds like the line endings changed as well.
>

Sigh... if only svn would support Unicode encodings.

BOb


--047d7b86d7766c023e04e867dc30--