[Monotone-commits-diffs] Revision d2d539af06eb22be04aabb884b41704320311761

[monotone]

-----------------------------------------------------------------
Revision: d2d539af06eb22be04aabb884b41704320311761
Ancestor: 1a84c48322fbab0ebdf1d824918f67c6ff109f10
Author: address@hidden
Date: 2009-02-07T20:31:32
Branch: net.venge.monotone

Renamed entries:
        diff_patch.cc to diff_output.cc
        diff_patch.hh to diff_output.hh
        merge.cc to merge_content.cc
        merge.hh to merge_content.hh
        roster_merge.cc to merge_roster.cc
        roster_merge.hh to merge_roster.hh
Modified files:
        Makefile.am cmd_conflicts.cc cmd_diff_log.cc cmd_files.cc
        cmd_merging.cc cmd_netsync.cc cmd_ws_commit.cc
        diff_output.cc diff_output.hh interner.hh merge_content.cc
        merge_content.hh merge_roster.cc merge_roster.hh
        po/POTFILES.in work.cc

ChangeLog: 

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

  Split diff_patch.cc in half: diff_output.cc now has the code for writing
  out human readable diffs (entry point make_diff()), merge_3way.cc now has
  the code for three-way machine-processable merge (entry point merge3()).
  Only the latter has unit tests.  Also some file renames for consistency.

  merge_roster.cc (formerly roster_merge.cc) is now the only file keeping
  database.o in the unit tester.

txtjEUtuAQJ91.txt
Description: Diff [1a84c48322fbab0ebdf1d824918f67c6ff109f10] -> [d2d539af06eb22be04aabb884b41704320311761]