From owner-freebsd-cvsweb@FreeBSD.ORG Wed Oct 27 21:47:03 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 4CF0016A4CE for ; Wed, 27 Oct 2004 21:47:03 +0000 (GMT) Received: from mail.rrinc.com (proxy.rrinc.com [206.158.104.138]) by mx1.FreeBSD.org (Postfix) with ESMTP id E190A43D45 for ; Wed, 27 Oct 2004 21:46:57 +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 E028AA0D1D for ; Wed, 27 Oct 2004 17:46:56 -0400 (EDT) Received: from [191.173.42.9] (twix.rrinc.com [191.173.42.9]) by mail.rrinc.com (Postfix) with ESMTP id 50C0CA0D1C for ; Wed, 27 Oct 2004 17:46:56 -0400 (EDT) Mime-Version: 1.0 (Apple Message framework v619) To: freebsd-cvsweb@freebsd.org Message-Id: Content-Type: multipart/mixed; boundary=Apple-Mail-1-347331689 From: Tim Buck Date: Wed, 27 Oct 2004 17:46:55 -0400 X-Mailer: Apple Mail (2.619) X-Content-Filtered-By: Mailman/MimeDel 2.1.1 Subject: 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: Wed, 27 Oct 2004 21:47:03 -0000 --Apple-Mail-1-347331689 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset=US-ASCII; format=flowed 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. Here is an example -- the unified diff output correctly reads: @@ -7257,7 +7257,7 @@ RRISTAT TAttrPanel_Private::PutStringLis } } - delete string_list; + delete [] string_list; } else { While the colored diff output displays the two lines as: deletestring_list; delete[] string_list; Attached is the full HTML file that was output, to show this in context. I can't figure out what the problem is. Thanks for any help you can provide! --Apple-Mail-1-347331689 Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename=attredit_panel.cpp.html MIME-Version: 1.0 Content-Type: text/plain; x-unix-mode="0666"; name="attredit_panel.cpp.html" [1][BACK] Return to [2]attredit_panel.cpp CVS log [TXT] [DIR] Up to [3][Development] / [4]systems / [5]formworks / [6]attrpanel / [7]src.bcb_attrpanel Diff format: [Colored.....] Show 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 [8]version 1.62, 2003/09/03 19:10:14 [9]version 1.63, 2004/10/27 11:59:47 [10]Line 7257 RRISTAT TAttrPanel_Private::PutStringLis [11]Line 7257 RRISTAT TAttrPanel_Private::PutStringLis } } } } deletestring_list; delete[] string_list; } } else else { { [12]Line 7308 RRISTAT TAttrPanel_Private::PutStringLis [13]Line 7308 RRISTAT TAttrPanel_Private::PutStringLis } } } } deletelist; delete[] list; } } else else { { [14]Line 7359 RRISTAT TAttrPanel_Private::PutStringLis [15]Line 7359 RRISTAT TAttrPanel_Private::PutStringLis } } } } deletelist; delete[] list; } } else else { { [16]Line 7410 RRISTAT TAttrPanel_Private::PutStringLis [17]Line 7410 RRISTAT TAttrPanel_Private::PutStringLis } } } } deletelist; delete[] list; } } else else { { _________________________________________________________________ Diff format: [Colored.....] Show Removed from v.1.62 changed lines Added in v.1.63 _________________________________________________________________ Tim Buck <[18]tbuck@rrinc.com> References 1. file://localhost/cgi-bin/cvsweb-new/systems/formworks/attrpanel/src.bcb_attrpanel/attredit_panel.cpp#rev1.63 2. file://localhost/cgi-bin/cvsweb-new/systems/formworks/attrpanel/src.bcb_attrpanel/attredit_panel.cpp#rev1.63 3. file://localhost/cgi-bin/cvsweb-new/#dirlist 4. file://localhost/cgi-bin/cvsweb-new/systems/#dirlist 5. file://localhost/cgi-bin/cvsweb-new/systems/formworks/#dirlist 6. file://localhost/cgi-bin/cvsweb-new/systems/formworks/attrpanel/#dirlist 7. file://localhost/cgi-bin/cvsweb-new/systems/formworks/attrpanel/src.bcb_attrpanel/#dirlist 8. file://localhost/tmp/attredit_panel.cpp;rev=1.62 9. file://localhost/tmp/attredit_panel.cpp;rev=1.63 10. file://localhost/tmp/attredit_panel.cpp;content-type=text%2Fx-cvsweb-markup;ln=1;rev=1.62#l7257 11. file://localhost/tmp/attredit_panel.cpp;content-type=text%2Fx-cvsweb-markup;ln=1;rev=1.63#l7257 12. file://localhost/tmp/attredit_panel.cpp;content-type=text%2Fx-cvsweb-markup;ln=1;rev=1.62#l7308 13. file://localhost/tmp/attredit_panel.cpp;content-type=text%2Fx-cvsweb-markup;ln=1;rev=1.63#l7308 14. file://localhost/tmp/attredit_panel.cpp;content-type=text%2Fx-cvsweb-markup;ln=1;rev=1.62#l7359 15. file://localhost/tmp/attredit_panel.cpp;content-type=text%2Fx-cvsweb-markup;ln=1;rev=1.63#l7359 16. file://localhost/tmp/attredit_panel.cpp;content-type=text%2Fx-cvsweb-markup;ln=1;rev=1.62#l7410 17. file://localhost/tmp/attredit_panel.cpp;content-type=text%2Fx-cvsweb-markup;ln=1;rev=1.63#l7410 18. mailto:tbuck@rrinc.com --Apple-Mail-1-347331689 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 Good judgment comes from bad experience; a lot of that comes from bad judgment. --Apple-Mail-1-347331689--