[Monotone-commits-diffs] Revision 5f229dccb99f3847daf9887d25a9d419be89d5dd

[monotone]

-----------------------------------------------------------------
Revision: 5f229dccb99f3847daf9887d25a9d419be89d5dd
Ancestor: 6f82c27b3ea507bb474098c523fd679cb76d4b34
Author: address@hidden
Date: 2006-07-11T05:52:10
Branch: net.venge.monotone.diff-p

Deleted entries:
        tests/diff_output_formats_CREATEDONBRANCH
        tests/diff_output_formats_CREATEDONBRANCH/A.cd
        tests/diff_output_formats_CREATEDONBRANCH/A.dst
        tests/diff_output_formats_CREATEDONBRANCH/A.src
        tests/diff_output_formats_CREATEDONBRANCH/A.ud
        tests/diff_output_formats_CREATEDONBRANCH/B.cd
        tests/diff_output_formats_CREATEDONBRANCH/B.dst
        tests/diff_output_formats_CREATEDONBRANCH/B.src
        tests/diff_output_formats_CREATEDONBRANCH/B.ud
        tests/diff_output_formats_CREATEDONBRANCH/C.cd
        tests/diff_output_formats_CREATEDONBRANCH/C.dst
        tests/diff_output_formats_CREATEDONBRANCH/C.src
        tests/diff_output_formats_CREATEDONBRANCH/C.ud
        tests/diff_output_formats_CREATEDONBRANCH/D.cd
        tests/diff_output_formats_CREATEDONBRANCH/D.dst
        tests/diff_output_formats_CREATEDONBRANCH/D.src
        tests/diff_output_formats_CREATEDONBRANCH/D.ud
        tests/diff_output_formats_CREATEDONBRANCH/E.cd
        tests/diff_output_formats_CREATEDONBRANCH/E.dst
        tests/diff_output_formats_CREATEDONBRANCH/E.src
        tests/diff_output_formats_CREATEDONBRANCH/E.ud
        tests/diff_output_formats_CREATEDONBRANCH/F.cd
        tests/diff_output_formats_CREATEDONBRANCH/F.dst
        tests/diff_output_formats_CREATEDONBRANCH/F.src
        tests/diff_output_formats_CREATEDONBRANCH/F.ud
        tests/diff_output_formats_CREATEDONBRANCH/G.cd
        tests/diff_output_formats_CREATEDONBRANCH/G.dst
        tests/diff_output_formats_CREATEDONBRANCH/G.src
        tests/diff_output_formats_CREATEDONBRANCH/G.ud
        tests/diff_output_formats_CREATEDONBRANCH/H.cd
        tests/diff_output_formats_CREATEDONBRANCH/H.dst
        tests/diff_output_formats_CREATEDONBRANCH/H.src
        tests/diff_output_formats_CREATEDONBRANCH/H.ud
        tests/diff_output_formats_CREATEDONBRANCH/I.cd
        tests/diff_output_formats_CREATEDONBRANCH/I.dst
        tests/diff_output_formats_CREATEDONBRANCH/I.src
        tests/diff_output_formats_CREATEDONBRANCH/I.ud
        tests/diff_output_formats_CREATEDONBRANCH/J.cd
        tests/diff_output_formats_CREATEDONBRANCH/J.dst
        tests/diff_output_formats_CREATEDONBRANCH/J.src
        tests/diff_output_formats_CREATEDONBRANCH/J.ud
        tests/diff_output_formats_CREATEDONBRANCH/__driver__.lua
        tests/diff_output_formats_CREATEDONBRANCH/hello.cd
        tests/diff_output_formats_CREATEDONBRANCH/hello.dst
        tests/diff_output_formats_CREATEDONBRANCH/hello.src
        tests/diff_output_formats_CREATEDONBRANCH/hello.ud
Renamed entries:
        tests/diff_output_formats_CREATEDONBRANCH/A.cdp to 
tests/diff_output_formats/A.cdp
        tests/diff_output_formats_CREATEDONBRANCH/A.udp to 
tests/diff_output_formats/A.udp
        tests/diff_output_formats_CREATEDONBRANCH/B.cdp to 
tests/diff_output_formats/B.cdp
        tests/diff_output_formats_CREATEDONBRANCH/B.udp to 
tests/diff_output_formats/B.udp
        tests/diff_output_formats_CREATEDONBRANCH/C.cdp to 
tests/diff_output_formats/C.cdp
        tests/diff_output_formats_CREATEDONBRANCH/C.udp to 
tests/diff_output_formats/C.udp
        tests/diff_output_formats_CREATEDONBRANCH/D.cdp to 
tests/diff_output_formats/D.cdp
        tests/diff_output_formats_CREATEDONBRANCH/D.udp to 
tests/diff_output_formats/D.udp
        tests/diff_output_formats_CREATEDONBRANCH/E.cdp to 
tests/diff_output_formats/E.cdp
        tests/diff_output_formats_CREATEDONBRANCH/E.udp to 
tests/diff_output_formats/E.udp
        tests/diff_output_formats_CREATEDONBRANCH/F.cdp to 
tests/diff_output_formats/F.cdp
        tests/diff_output_formats_CREATEDONBRANCH/F.udp to 
tests/diff_output_formats/F.udp
        tests/diff_output_formats_CREATEDONBRANCH/G.cdp to 
tests/diff_output_formats/G.cdp
        tests/diff_output_formats_CREATEDONBRANCH/G.udp to 
tests/diff_output_formats/G.udp
        tests/diff_output_formats_CREATEDONBRANCH/H.cdp to 
tests/diff_output_formats/H.cdp
        tests/diff_output_formats_CREATEDONBRANCH/H.udp to 
tests/diff_output_formats/H.udp
        tests/diff_output_formats_CREATEDONBRANCH/I.cdp to 
tests/diff_output_formats/I.cdp
        tests/diff_output_formats_CREATEDONBRANCH/I.udp to 
tests/diff_output_formats/I.udp
        tests/diff_output_formats_CREATEDONBRANCH/J.cdp to 
tests/diff_output_formats/J.cdp
        tests/diff_output_formats_CREATEDONBRANCH/J.udp to 
tests/diff_output_formats/J.udp
        tests/diff_output_formats_CREATEDONBRANCH/hello.cdp to 
tests/diff_output_formats/hello.cdp
        tests/diff_output_formats_CREATEDONBRANCH/hello.udp to 
tests/diff_output_formats/hello.udp
Modified files:
        ChangeLog cmd_diff_log.cc diff_patch.cc diff_patch.hh
        tests/diff_output_formats/A.cdp
        tests/diff_output_formats/A.udp
        tests/diff_output_formats/B.cdp
        tests/diff_output_formats/B.udp
        tests/diff_output_formats/C.cdp
        tests/diff_output_formats/C.udp
        tests/diff_output_formats/D.cdp
        tests/diff_output_formats/D.udp
        tests/diff_output_formats/E.cdp
        tests/diff_output_formats/E.udp
        tests/diff_output_formats/F.cdp
        tests/diff_output_formats/F.udp
        tests/diff_output_formats/G.cdp
        tests/diff_output_formats/G.udp
        tests/diff_output_formats/H.cdp
        tests/diff_output_formats/H.udp
        tests/diff_output_formats/I.cdp
        tests/diff_output_formats/I.udp
        tests/diff_output_formats/J.cdp
        tests/diff_output_formats/J.udp
        tests/diff_output_formats/__driver__.lua

ChangeLog: 

        * tests/diff_output_formats: Merge from mainline.  Correct
        expected output where necessary.  Use long switches in __driver__.lua.
        * diff_patch.cc (hunk_consumer::find_encloser): Use
        reverse_iterators instead of mucking with ssize_t.
        (unidiff_hunk_writer::flush_hunk)
        (ctxdiff_hunk_writer::flush_hunk): Scan what is about to be
        output, and give find_encloser exactly the right position.
        (make_diff): Collapse the overload that takes vectors of strings
        into its sole caller, the other overload.  * diff_patch.hh: Remove
        prototype for deleted overload of make_diff.

txtc9sFT1Hg_n.txt
Description: Diff [6f82c27b3ea507bb474098c523fd679cb76d4b34] -> [5f229dccb99f3847daf9887d25a9d419be89d5dd]