Re: [Monotone-devel] Re: monotone "diff" format

[Richard Levitte - VMS Whacker]

In message <address@hidden> on Tue, 26 Oct 2004 22:38:33 -0400, graydon hoare 
<address@hidden> said:

graydon> Neil Conway wrote:
graydon> 
graydon> > (Notice the "683" rather than "684"). This inaccuracy incrementally
graydon> > increases in each chunk of the patch. Let me know if you need any 
more
graydon> > information to reproduce this.
graydon> > 
graydon> > I think the current behavior is pretty harmless, but it would be 
nice if
graydon> > I could get patch(1) to stop complaining :-)
graydon> 
graydon> I believe richard fixed this shortly after 0.14; it should not be a 
graydon> problem in 0.15 when it is released.

Yup, here's the changelog for that one:

Version: cb9127ee6f67c27db3acca05f86cb33e7ffdad27
Author: address@hidden
Date: 2004-09-02T14:37:00
ChangeLog:

 2004-09-02  Richard Levitte  <address@hidden>

        fix bug 8715 and more
        * diff_patch.cc (struct unidiff_hunk_writer,
        unidiff_hunk_writer::flush_hunk): the skew is not just the
        size difference between added and deleted lines in the current
        hunk, it's the size difference between /all/ added and deleted
        lines so far.  Therefore, the skew needs to be a member of the
        struct rather than being something calculated for each hunk.
        Furthermore, we need to add trailing context even if the change
        only consisted of one line.

Cheers,
Richard

-----
Please consider sponsoring my work on free software.
See http://www.free.lp.se/sponsoring.html for details.

-- 
Richard Levitte                         address@hidden
                                        http://richard.levitte.org/

"When I became a man I put away childish things, including
 the fear of childishness and the desire to be very grown up."
                                                -- C.S. Lewis