[Monotone-commits-nodiffs] Revision cfa665d633051b68da200349a3018cd09d787898

[monotone]

-----------------------------------------------------------------
Revision: cfa665d633051b68da200349a3018cd09d787898
Ancestor: 6d38fa3263f346809263d51bbec692925d8f136b
Ancestor: 8d7dc6653aaa843bbdefef492923e01a55e5a8ac
Author: address@hidden
Date: 2007-02-09T17:51:08
Branch: net.venge.monotone.cvssync.refactor

Deleted entries:
        tests/common/automate_ancestry.lua tests/common/cvs.lua
        tests/common/netsync-hooks.lua
        tests/common/netsync-hooks_with_notes.lua
        tests/common/netsync.lua tests/common/selectors.lua
Added files:
        mtn_cvs/CVS_prot mtn_cvs/Makefile.am mtn_cvs/botan/md5.cpp
        mtn_cvs/botan/md5.h mtn_cvs/cvs_client.cc
        mtn_cvs/cvs_client.hh mtn_cvs/cvs_edge.cc
        mtn_cvs/cvs_revision_nr.cc mtn_cvs/cvs_sync.cc
        mtn_cvs/cvs_sync.hh mtn_cvs/mtn_automate.cc
        mtn_cvs/mtn_automate.hh mtn_cvs/mtn_cvs.cc
        mtn_cvs/mtn_pipe.cc mtn_cvs/mtn_pipe.hh
        mtn_cvs/mtncvs_state.cc mtn_cvs/mtncvs_state.hh
        mtn_cvs/old_tests/cleanup mtn_cvs/old_tests/cvs_test_setup
        mtn_cvs/old_tests/cvs_test_setup2
        mtn_cvs/old_tests/cvs_test_setup3
        mtn_cvs/old_tests/cvs_test_setup4
        mtn_cvs/old_tests/cvs_test_setup5 mtn_cvs/old_tests/db_setup
        mtn_cvs/old_tests/db_setup2 mtn_cvs/old_tests/settings
        mtn_cvs/old_tests/show_disk_usage
        mtn_cvs/old_tests/t_cvspull_combined.at
        mtn_cvs/old_tests/t_cvspull_committemplate.at
        mtn_cvs/old_tests/t_cvspull_cvsbranch.at
        mtn_cvs/old_tests/t_cvspull_md5fail.at
        mtn_cvs/old_tests/t_cvspull_rapid.at
        mtn_cvs/old_tests/t_cvspull_samedirname.at
        mtn_cvs/old_tests/t_cvspull_separate.at
        mtn_cvs/old_tests/t_cvspull_xmodule.at
        mtn_cvs/old_tests/t_cvspush_loop.at
        mtn_cvs/old_tests/t_cvstakeover_modified.at
        mtn_cvs/old_tests/test_all mtn_cvs/options.cc
        mtn_cvs/options.hh mtn_cvs/options_list.hh
        mtn_cvs/piece_table.cc mtn_cvs/piece_table.hh
        mtn_cvs/stringtok.hh
        mtn_cvs/tests/common/automate_ancestry.lua
        mtn_cvs/tests/common/cvs.lua
        mtn_cvs/tests/common/netsync-hooks.lua
        mtn_cvs/tests/common/netsync-hooks_with_notes.lua
        mtn_cvs/tests/common/netsync.lua
        mtn_cvs/tests/common/selectors.lua
        mtn_cvs/tests/min_hooks.lua
        mtn_cvs/tests/pull_combined/__driver__.lua
        mtn_cvs/tests/pull_committemplate/__driver__.lua
        mtn_cvs/tests/pull_cvsbranch/__driver__.lua
        mtn_cvs/tests/pull_md5fail/__driver__.lua
        mtn_cvs/tests/pull_md5fail/test/A,v
        mtn_cvs/tests/pull_md5fail/test/B,v
        mtn_cvs/tests/pull_md5fail/test/dir/D,v
        mtn_cvs/tests/pull_rapid/__driver__.lua
        mtn_cvs/tests/pull_samedirname/__driver__.lua
        mtn_cvs/tests/pull_separate/__driver__.lua
        mtn_cvs/tests/pull_xmodule/__driver__.lua
        mtn_cvs/tests/push_loop/__driver__.lua
        mtn_cvs/tests/push_simple/__driver__.lua
        mtn_cvs/tests/takeover_basic/__driver__.lua
        mtn_cvs/tests/takeover_modified/__driver__.lua
        mtn_cvs/tests/test_hooks.lua mtn_cvs/tests/test_keys
        mtn_cvs/testsuite.lua
        tests/automate_sync_info/__driver__.lua
Added directories:
        mtn_cvs mtn_cvs/botan mtn_cvs/old_tests mtn_cvs/tests
        mtn_cvs/tests/common mtn_cvs/tests/pull_combined
        mtn_cvs/tests/pull_committemplate
        mtn_cvs/tests/pull_cvsbranch mtn_cvs/tests/pull_md5fail
        mtn_cvs/tests/pull_md5fail/test
        mtn_cvs/tests/pull_md5fail/test/Attic
        mtn_cvs/tests/pull_md5fail/test/dir mtn_cvs/tests/pull_rapid
        mtn_cvs/tests/pull_samedirname mtn_cvs/tests/pull_separate
        mtn_cvs/tests/pull_xmodule mtn_cvs/tests/push_loop
        mtn_cvs/tests/push_simple mtn_cvs/tests/takeover_basic
        mtn_cvs/tests/takeover_modified tests/automate_sync_info
Modified files:
        ChangeLog Makefile.am cmd_merging.cc commands.cc
        configure.ac diff_patch.cc diff_patch.hh po/de.po
        tests/checkout_does_not_clobber_workspace/__driver__.lua
        tests/test_a_merge_8/correct tests/test_a_merge_8/left
        tests/test_a_merge_8/parent tests/test_a_merge_8/right
        testsuite.lua ui.cc ui.hh work.cc
Modified attrs:
        mtn_cvs/old_tests/cleanup mtn_cvs/old_tests/cvs_test_setup
        mtn_cvs/old_tests/cvs_test_setup2
        mtn_cvs/old_tests/cvs_test_setup3
        mtn_cvs/old_tests/cvs_test_setup4
        mtn_cvs/old_tests/cvs_test_setup5 mtn_cvs/old_tests/db_setup
        mtn_cvs/old_tests/db_setup2 mtn_cvs/old_tests/settings
        mtn_cvs/old_tests/show_disk_usage mtn_cvs/old_tests/test_all
        mtn_cvs/testsuite.lua

ChangeLog: 

propagate from branch 'net.venge.monotone.cvssync.candidates' (head 
8d7dc6653aaa843bbdefef492923e01a55e5a8ac)
            to branch 'net.venge.monotone.cvssync.refactor' (head 
6d38fa3263f346809263d51bbec692925d8f136b)


monotone --db={your.database} diff 
--revision=6d38fa3263f346809263d51bbec692925d8f136b 
--revision=cfa665d633051b68da200349a3018cd09d787898
monotone --db={your.database} diff 
--revision=8d7dc6653aaa843bbdefef492923e01a55e5a8ac 
--revision=cfa665d633051b68da200349a3018cd09d787898
----------------------------------------------------------------------