From owner-freebsd-cvsweb@FreeBSD.ORG Thu Oct 28 20:23:14 2004 Return-Path: Delivered-To: freebsd-cvsweb@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 5FC9716A4CF for ; Thu, 28 Oct 2004 20:23:14 +0000 (GMT) Received: from mail.rrinc.com (proxy.rrinc.com [206.158.104.138]) by mx1.FreeBSD.org (Postfix) with ESMTP id 1AAFA43D54 for ; Thu, 28 Oct 2004 20:23:13 +0000 (GMT) (envelope-from tbuck@rrinc.com) Received: from 127.0.0.1 (localhost [127.0.0.1]) by dummy.domain.name (Postfix) with SMTP id 71975A0D21 for ; Thu, 28 Oct 2004 16:23:12 -0400 (EDT) Received: from [191.173.42.9] (twix.rrinc.com [191.173.42.9]) by mail.rrinc.com (Postfix) with ESMTP id 3AE4AA0D18 for ; Thu, 28 Oct 2004 16:23:12 -0400 (EDT) Mime-Version: 1.0 (Apple Message framework v619) In-Reply-To: <1098991135.27565.37.camel@bobcat.mine.nu> References: <1098991135.27565.37.camel@bobcat.mine.nu> Content-Type: multipart/mixed; boundary=Apple-Mail-1-428708050 Message-Id: <30C0EC42-291F-11D9-91B4-000393C83AC4@rrinc.com> From: Tim Buck Date: Thu, 28 Oct 2004 16:23:12 -0400 To: freebsd-cvsweb@freebsd.org X-Mailer: Apple Mail (2.619) Subject: Re: Spaces being eaten in colored diffs X-BeenThere: freebsd-cvsweb@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: CVS Web maintenance mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 28 Oct 2004 20:23:14 -0000 --Apple-Mail-1-428708050 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset=ISO-8859-1; format=flowed On Oct 28, 2004, at 3:18 PM, Ville Skytt=E4 wrote: > On Thu, 2004-10-28 at 00:46, Tim Buck wrote: >> I'm seeing some strange behavior in CVSweb, both v3.0.1 and 3.0.2. >> Spaces are being "eaten" in the colored (human-readable) diff output >> under certain circumstances. The output is correct for the unified >> and context diffs. > > Do you have String::Ediff installed? It has known whitespace related > limitations. Yes, I do have that module installed. Should I remove it? Should I have an alternate module installed instead? > >> Attached is the full HTML file that was output [...] > > Nope, that's not HTML ;) It was when I attached it -- apparently the list processing software mangled it. I'll try again, with a .txt extension appended to the filename. --Apple-Mail-1-428708050 Content-Transfer-Encoding: 7bit Content-Type: text/plain; x-unix-mode=0666; name="attredit_panel.cpp.html.txt" Content-Disposition: attachment; filename=attredit_panel.cpp.html.txt systems/formworks/attrpanel/src.bcb_attrpanel/attredit_panel.cpp - diff - 1.63
Removed from v.1.62  
changed lines
  Added in v.1.63

Diff for /systems/formworks/attrpanel/src.bcb_attrpanel/attredit_panel.cpp between versions 1.62 and 1.63

version 1.62, 2003/09/03 19:10:14 version 1.63, 2004/10/27 11:59:47
Line 7257  RRISTAT TAttrPanel_Private::PutStringLis Line 7257  RRISTAT TAttrPanel_Private::PutStringLis
             }              }
         }          }
   
       deletestring_list;        delete[] string_list;
     }      }
     else      else
     {      {
Line 7308  RRISTAT TAttrPanel_Private::PutStringLis Line 7308  RRISTAT TAttrPanel_Private::PutStringLis
             }              }
         }          }
   
       deletelist;        delete[] list;
     }      }
     else      else
     {      {
Line 7359  RRISTAT TAttrPanel_Private::PutStringLis Line 7359  RRISTAT TAttrPanel_Private::PutStringLis
             }              }
         }          }
   
       deletelist;        delete[] list;
     }      }
     else      else
     {      {
Line 7410  RRISTAT TAttrPanel_Private::PutStringLis Line 7410  RRISTAT TAttrPanel_Private::PutStringLis
             }              }
         }          }
   
       deletelist;        delete[] list;
     }      }
     else      else
     {      {

Removed from v.1.62  
changed lines
  Added in v.1.63


Tim Buck <tbuck@rrinc.com>
--Apple-Mail-1-428708050 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset=US-ASCII; format=flowed Tim Buck * Information Technology Manager * Recognition Research, Inc. PHONE +1 540 961-6500 * FAX +1 540 961-3568 * EMAIL tbuck@rrinc.com The only thing to do with good advice is to pass it on. -- Oscar Wilde --Apple-Mail-1-428708050--