[Monotone-commits-diffs] Revision 1a84c48322fbab0ebdf1d824918f67c6ff109f10

[monotone]

-----------------------------------------------------------------
Revision: 1a84c48322fbab0ebdf1d824918f67c6ff109f10
Ancestor: 198e9ece970b4ba85df69b0d3c35763c13b683d9
Author: address@hidden
Date: 2009-02-07T20:01:18
Branch: net.venge.monotone

Modified files:
        Makefile.am cmd_netsync.cc cmd_ws_commit.cc diff_patch.cc
        diff_patch.hh merge.cc merge.hh roster_merge.hh work.cc

ChangeLog: 

Code reorganization to reduce number of modules linked into unit tester (6/n)

  Move the content_merge_adaptor classes and some related code from
  diff_patch.cc/hh to merge.cc/hh.  This (temporarily, one hopes) requires
  adding merge.cc to the unit_tester link since roster_merge.cc still uses
  those classes.  But it does kill the diff_patch -> lua dependency.

txtl5g5bv4rOP.txt
Description: Diff [198e9ece970b4ba85df69b0d3c35763c13b683d9] -> [1a84c48322fbab0ebdf1d824918f67c6ff109f10]