[Monotone-commits-diffs] Revision 31469dc67478e2697dad0d0269488043bc4bc254

[monotone]

-----------------------------------------------------------------
Revision: 31469dc67478e2697dad0d0269488043bc4bc254
Ancestor: 5306ba58602c6448ea980100b5fdefcd5d5f9839
Ancestor: c15d63145516bfde10443dd31aafededa94413dc
Author: address@hidden
Date: 2008-01-11T09:16:29
Branch: net.venge.monotone.experiment.db-compaction

Deleted entries:
        tests/show_conflicts tests/show_conflicts/__driver__.lua
Renamed entries:
        tests/automate_db_set,get to tests/automate_db_variables
        visualc/unit_tests.vcproj to visualc/unit_tester.vcproj
Added files:
        tests/calculation_of_unidiffs_start_of_file/__driver__.lua
        tests/calculation_of_unidiffs_start_of_file/firstfile
        tests/calculation_of_unidiffs_start_of_file/secondfile
        tests/conflict_messages/__driver__.lua
        tests/duplicate_key_id/__driver__.lua
        tests/duplicate_key_id/bad_test_key
        tests/merge((patch_a),_(drop_a))/__driver__.lua
Added directories:
        tests/calculation_of_unidiffs_start_of_file
        tests/conflict_messages tests/duplicate_key_id
        tests/merge((patch_a),_(drop_a))
Modified files:
        Makefile.am NEWS UPGRADE automate.cc cert.cc cmd_automate.cc
        cmd_diff_log.cc cmd_files.cc cmd_key_cert.cc cmd_list.cc
        cmd_merging.cc cmd_netsync.cc cmd_ws_commit.cc configure.ac
        database.cc database.hh debian/changelog debian/control
        debian/copyright debian/monotone-server.postrm debian/rules
        diff_patch.cc diff_patch.hh file_io.hh key_store.cc lcs.cc
        lru_writeback_cache.hh lua.cc m4/pcre.m4 merge.cc
        monotone.spec monotone.texi netsync.cc netxx/address.cxx
        netxx/peer.cxx netxx_pipe.cc notes/release-checklist.txt
        numeric_vocab.cc packet.cc paths.hh platform.hh
        po/POTFILES.in po/de.po po/es.po po/it.po po/sv.po
        revision.cc roster.cc roster.hh roster_merge.cc
        roster_merge.hh sanity.hh schema.sql schema_migration.cc
        ssh_agent.cc std_hooks.lua tester.cc
        tests/automate_db_variables/__driver__.lua
        tests/command_completion/__driver__.lua
        tests/server_initiated_sync/__driver__.lua
        tests/syntax_errors_in_.mtn-ignore/__driver__.lua unix/fs.cc
        unix/tester-plaf.cc visualc/config.h visualc/monotone.sln
        visualc/runtests.bat visualc/unit_tester.vcproj
        win32/main.cc win32/monotone.iss win32/ssh_agent_platform.cc
        win32/ssh_agent_platform.hh work.cc xdelta.cc

ChangeLog: 

explicit merge of 'c15d63145516bfde10443dd31aafededa94413dc'
              and '5306ba58602c6448ea980100b5fdefcd5d5f9839'


monotone --db={your.database} diff 
--revision=5306ba58602c6448ea980100b5fdefcd5d5f9839 
--revision=31469dc67478e2697dad0d0269488043bc4bc254
monotone --db={your.database} diff 
--revision=c15d63145516bfde10443dd31aafededa94413dc 
--revision=31469dc67478e2697dad0d0269488043bc4bc254
----------------------------------------------------------------------