Skip site navigation (1)Skip section navigation (2) 
Date:      Wed, 27 Oct 2004 17:46:55 -0400
From:      Tim Buck <tbuck@rrinc.com>
To:        freebsd-cvsweb@freebsd.org
Subject:   Spaces being eaten in colored diffs
Message-ID:  <B8A9C606-2861-11D9-8C61-000393C83AC4@rrinc.com>
next in thread | raw e-mail | index | archive | help 

--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--

Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?B8A9C606-2861-11D9-8C61-000393C83AC4>