[Monotone-commits-diffs] Revision fbd2d59bb00c830f4cd98886a2269c8f3d97fdcd

[monotone]

-----------------------------------------------------------------
Revision: fbd2d59bb00c830f4cd98886a2269c8f3d97fdcd
Ancestor: ea8c5dc8db7d7be7f86566329db6bd40bbf06a80
Author: address@hidden
Date: 2005-08-16T16:59:16
Branch: net.venge.monotone.precise-cdv

Modified files:
        ChangeLog change_set.cc change_set.hh commands.cc pcdv.cc
        pcdv.hh

ChangeLog: 

2005-08-16  Timothy Brownawell  <address@hidden>
        * change_set.{cc,hh}: Replace tree merger with the one in pcdv.{cc,hh}.
                DOES NOT pass ./testsuite (13 failures, 1 unexpected pass)
                REMOVE disjoint_merge_test() (no longer applicable in
                this form, and the same functionality is checked in tests/ .)
        * commands.cc: New merger takes different arguments; update calls.
        * pcdv.{cc,hh}: Handle sutures better.

txt9K6J2R6skC.txt
Description: Diff [ea8c5dc8db7d7be7f86566329db6bd40bbf06a80] -> [fbd2d59bb00c830f4cd98886a2269c8f3d97fdcd]