[Monotone-commits-diffs] Revision 75cb9278213902e6cc9ffac6e580bbc5464b6d06

[monotone]

-----------------------------------------------------------------
Revision: 75cb9278213902e6cc9ffac6e580bbc5464b6d06
Ancestor: 067a177f2d6daee1774ea722651006574228bdea
Ancestor: cc7f866bbfd2800324dbb7ff3781a614c4615f19
Author: address@hidden
Date: 2008-02-10T22:47:59
Branch: net.venge.monotone.cvssync.refactor

Deleted entries:
        botan/gzip.cpp botan/gzip.h contrib/monotone-import.pl
        contrib/usher.cc debian/monotone.install
        m4/ax_create_stdint_h.m4 tests/common/automate_ancestry.lua
        tests/common/netsync-hooks.lua
        tests/common/netsync-hooks_with_notes.lua
        tests/common/netsync.lua tests/common/selectors.lua
        tests/db_kill_rev_locally_command_2
        tests/db_kill_rev_locally_command_2/__driver__.lua
        tests/show_conflicts tests/show_conflicts/__driver__.lua
        views.sql
Renamed entries:
        debian/monotone.info to debian/monotone-doc.info
        tests/automate_attributes to tests/automate_get_attributes
        tests/automate_db_set,get to tests/automate_db_variables
        tests/automate_inventory/inventory_hooks.lua to 
tests/inventory_hooks.lua
        tests/db_kill_rev_and_recommit to tests/db_kill_rev_locally_and_recommit
        tests/db_kill_rev_locally_command to tests/db_kill_rev_locally
        testsuite.lua to lua-testsuite.lua
Added files:
        audit-includes base.hh botan/cbc_mac.cpp botan/cbc_mac.h
        botan/dsa_gen.cpp botan/loadstor.h botan/zlib.cpp
        botan/zlib.h contrib/Monotone.pm contrib/README.missing
        contrib/ciabot_monotone_hookversion.lua
        contrib/command/README contrib/command/base.lua
        contrib/command/conflicts.lua contrib/command/fuse.lua
        contrib/command/revision.lua contrib/extra-commands.lua
        contrib/lua-mode.el
        contrib/monotone-buildbot-notification.lua
        contrib/monotone-cluster-push.lua
        contrib/monotone-mail-notify.lua
        contrib/monotone-mail-notify.sh contrib/mtn_makepermissions
        current_exception.hh debian/monotone-doc.dirs
        debian/monotone.manpages debian/mtn.1 debian/po/nl.po
        gzip.cc gzip.hh hybrid_map.hh lexical_cast.hh
        m4/numeric_vocab.m4 m4/pcre.m4 m4/pkg.m4 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_add_drop/__driver__.lua
        mtn_cvs/tests/push_loop/__driver__.lua
        mtn_cvs/tests/push_pull_with_changes/__driver__.lua
        mtn_cvs/tests/push_rename/__driver__.lua
        mtn_cvs/tests/push_rename_and_change/__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 pcre/README pcre/pcre.h
        pcre/pcre_chartables.c pcre/pcre_compile.c
        pcre/pcre_config.c pcre/pcre_config.h pcre/pcre_dfa_exec.c
        pcre/pcre_exec.c pcre/pcre_fullinfo.c pcre/pcre_get.c
        pcre/pcre_globals.c pcre/pcre_info.c pcre/pcre_internal.h
        pcre/pcre_maketables.c pcre/pcre_newline.c
        pcre/pcre_ord2utf8.c pcre/pcre_refcount.c pcre/pcre_study.c
        pcre/pcre_tables.c pcre/pcre_try_flipped.c
        pcre/pcre_ucp_searchfuncs.c pcre/pcre_valid_utf8.c
        pcre/pcre_version.c pcre/pcre_xclass.c pcre/pcrepattern.texi
        pcre/pcresyntax.texi pcre/ucp.h pcre/ucpinternal.h
        pcre/ucptable.h pcrewrap.cc pcrewrap.hh
        specialized_lexical_cast.cc sqlite/btreeInt.h
        sqlite/malloc.c sqlite/sqliteLimit.h sqlite/vdbeblob.c
        tester-plaf.hh tests/alias_command/__driver__.lua
        tests/alias_command/extra_rc
        tests/automate_commands_are_not_completed/__driver__.lua
        tests/automate_identify/__driver__.lua
        tests/automate_inventory_ignore_dirs/__driver__.lua
        tests/automate_inventory_ignore_dirs/expected.stderr
        tests/automate_inventory_ignore_dirs/expected.stdout
        tests/automate_inventory_ignore_dirs/local_hooks.lua
        tests/automate_inventory_options/__driver__.lua
        tests/automate_inventory_options/expected-no-ignored.stdout
        tests/automate_inventory_options/expected-no-unchanged.stdout
        tests/automate_inventory_options/expected-no-unknown.stdout
        tests/automate_inventory_options/expected-none.stdout
        tests/automate_inventory_options/expected-renames-both.stdout
        tests/automate_inventory_options/expected-renames-source.stdout
        
tests/automate_inventory_options/expected-renames-target-no-ignored.stdout
        
tests/automate_inventory_options/expected-renames-target-no-unknown.stdout
        tests/automate_inventory_options/expected-renames-target.stdout
        tests/automate_inventory_options/test_hooks.lua
        tests/automate_inventory_restricted/__driver__.lua
        tests/automate_roots/__driver__.lua
        tests/automate_set_drop_attribute/__driver__.lua
        tests/automate_sync_info/__driver__.lua
        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/common/test_utils_inventory.lua
        tests/conflict_messages/__driver__.lua
        tests/db_kill_rev_locally_workspace/__driver__.lua
        tests/diff_restriction_renamed_parent/__driver__.lua
        tests/duplicate_key_id/__driver__.lua
        tests/duplicate_key_id/bad_test_key
        tests/imp_test_filesync_confdir/__driver__.lua
        tests/invoke_subcommands/__driver__.lua
        tests/invoke_toplevel_group/__driver__.lua
        tests/key_files_created_securely/__driver__.lua
        tests/keydir_defaults_to_under_confdir/__driver__.lua
        tests/merge((patch_a),_(drop_a))/__driver__.lua
        tests/merge_update_part_of_file/__driver__.lua
        tests/merge_update_part_of_file/after.diff
        tests/merge_update_part_of_file/before.diff
        tests/merge_update_part_of_file/onechange
        tests/merge_update_part_of_file/original
        tests/merge_update_part_of_file/twochanges
        tests/netsync_duplicate_keys/__driver__.lua
        tests/netsync_key_hook/__driver__.lua
        tests/netsync_key_hook/client-hooks.lua
        tests/netsync_key_hook/read-permissions
        tests/netsync_with_suspended_branch/__driver__.lua
        tests/pluck_directory_bug_1/__driver__.lua
        tests/pluck_directory_bug_2/__driver__.lua
        tests/restricted_diff_bug/__driver__.lua
        tests/revert_contents_not_parent_rename/__driver__.lua
        tests/revert_drop_not_rename/__driver__.lua
        tests/server_initiated_sync/__driver__.lua
        tests/server_initiated_sync/server1.rc
        tests/suspend/__driver__.lua
        tests/syntax_errors_in_.mtn-ignore/__driver__.lua
        tests/syntax_errors_in_.mtn-ignore/mtn-ignore
        tests/syntax_errors_in_.mtn-ignore/stderr-ref
        tests/syntax_errors_in_.mtn-ignore/stdout-ref
        tests/test_a_merge_9/__driver__.lua
        tests/test_a_merge_9/left tests/test_a_merge_9/parent
        tests/test_a_merge_9/right
        tests/test_the_version_command/__driver__.lua
        tests/update_with_pending_modification/__driver__.lua
        tests/user_commands/__driver__.lua
        tests/user_commands/extra_rc unit-testsuite.lua
        unix/tester-plaf.cc vector.hh visualc/pcre.vcproj
        visualc/runtests.bat visualc/unit_tester.vcproj
        vocab_hash.hh win32/monotone.bmp win32/tester-plaf.cc
Added directories:
        contrib/command 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_add_drop
        mtn_cvs/tests/push_loop mtn_cvs/tests/push_pull_with_changes
        mtn_cvs/tests/push_rename
        mtn_cvs/tests/push_rename_and_change
        mtn_cvs/tests/push_simple mtn_cvs/tests/takeover_basic
        mtn_cvs/tests/takeover_modified pcre tests/alias_command
        tests/automate_commands_are_not_completed
        tests/automate_identify tests/automate_inventory_ignore_dirs
        tests/automate_inventory_options
        tests/automate_inventory_restricted tests/automate_roots
        tests/automate_set_drop_attribute tests/automate_sync_info
        tests/calculation_of_unidiffs_start_of_file
        tests/conflict_messages tests/db_kill_rev_locally_workspace
        tests/diff_restriction_renamed_parent tests/duplicate_key_id
        tests/imp_test_filesync_confdir tests/invoke_subcommands
        tests/invoke_toplevel_group tests/key_files_created_securely
        tests/keydir_defaults_to_under_confdir
        tests/merge((patch_a),_(drop_a))
        tests/merge_update_part_of_file tests/netsync_duplicate_keys
        tests/netsync_key_hook tests/netsync_with_suspended_branch
        tests/pluck_directory_bug_1 tests/pluck_directory_bug_2
        tests/restricted_diff_bug
        tests/revert_contents_not_parent_rename
        tests/revert_drop_not_rename tests/server_initiated_sync
        tests/suspend tests/syntax_errors_in_.mtn-ignore
        tests/test_a_merge_9 tests/test_the_version_command
        tests/update_with_pending_modification tests/user_commands
Modified files:
        .mtn-ignore AUTHORS COPYING HACKING INSTALL Makefile.am NEWS
        ROADMAP UPGRADE adler32.hh annotate.cc app_state.cc
        app_state.hh asciik.cc asciik.hh automate.cc basic_io.cc
        basic_io.hh botan/README.botan-monotone botan/aes.cpp
        botan/aes.h botan/aes_tab.cpp botan/alg_id.cpp
        botan/alg_id.h botan/allocate.h botan/arc4.cpp botan/arc4.h
        botan/asn1_alt.cpp botan/asn1_att.cpp botan/asn1_dn.cpp
        botan/asn1_int.cpp botan/asn1_int.h botan/asn1_ku.cpp
        botan/asn1_obj.h botan/asn1_oid.cpp botan/asn1_oid.h
        botan/asn1_str.cpp botan/asn1_tm.cpp botan/base.cpp
        botan/base.h botan/base64.cpp botan/base64.h
        botan/basefilt.cpp botan/basefilt.h botan/ber_dec.cpp
        botan/ber_dec.h botan/big_base.cpp botan/big_code.cpp
        botan/big_io.cpp botan/big_ops2.cpp botan/big_ops3.cpp
        botan/big_rand.cpp botan/bigint.h botan/bit_ops.cpp
        botan/bit_ops.h botan/blinding.cpp botan/blinding.h
        botan/botan.h botan/buf_es.cpp botan/buf_es.h
        botan/buf_filt.cpp botan/buf_filt.h botan/build.h
        botan/cbc.cpp botan/cbc.h botan/certstor.cpp
        botan/certstor.h botan/cfb.cpp botan/cfb.h botan/charset.cpp
        botan/charset.h botan/config.cpp botan/config.h
        botan/crc32.cpp botan/crc32.h botan/credits.txt
        botan/crl_ent.cpp botan/crl_ent.h botan/ctr.cpp botan/ctr.h
        botan/cts.cpp botan/cts.h botan/data_snk.cpp
        botan/data_snk.h botan/data_src.cpp botan/data_src.h
        botan/datastor.cpp botan/datastor.h botan/def_alg.cpp
        botan/def_char.cpp botan/def_char.h botan/def_mode.cpp
        botan/def_ops.cpp botan/def_powm.cpp botan/def_powm.h
        botan/defalloc.cpp botan/defalloc.h botan/der_enc.cpp
        botan/der_enc.h botan/des.cpp botan/des.h botan/des_tab.cpp
        botan/dh.cpp botan/dh.h botan/divide.cpp botan/dl_algo.cpp
        botan/dl_algo.h botan/dl_group.cpp botan/dl_group.h
        botan/dlies.cpp botan/dlies.h botan/eax.cpp botan/eax.h
        botan/ecb.cpp botan/ecb.h botan/eme.h botan/eme1.cpp
        botan/eme_pkcs.cpp botan/emsa.h botan/emsa1.cpp
        botan/emsa2.cpp botan/emsa3.cpp botan/emsa4.cpp
        botan/emsa_raw.cpp botan/eng_base.cpp botan/eng_def.h
        botan/engine.cpp botan/engine.h botan/enums.h
        botan/es_capi.cpp botan/es_capi.h botan/es_egd.cpp
        botan/es_egd.h botan/es_file.cpp botan/es_file.h
        botan/es_win32.cpp botan/es_win32.h botan/exceptn.cpp
        botan/exceptn.h botan/filter.cpp botan/filter.h
        botan/filters.cpp botan/filters.h botan/fips140.cpp
        botan/fips140.h botan/get_algo.cpp botan/get_enc.cpp
        botan/get_pbe.cpp botan/hash_id.cpp botan/hash_id.h
        botan/hex.cpp botan/hex.h botan/hmac.cpp botan/hmac.h
        botan/if_algo.cpp botan/if_algo.h botan/inifile.cpp
        botan/init.h botan/init_def.cpp botan/init_opt.cpp
        botan/jacobi.cpp botan/kdf.cpp botan/kdf.h botan/keypair.cpp
        botan/keypair.h botan/libstate.cpp botan/libstate.h
        botan/license.txt botan/look_add.h botan/look_pk.cpp
        botan/look_pk.h botan/lookup.h botan/make_prm.cpp
        botan/mdx_hash.cpp botan/mdx_hash.h botan/mem_ops.h
        botan/mem_pool.cpp botan/mem_pool.h botan/mgf1.cpp
        botan/mgf1.h botan/mlock.cpp botan/mode_pad.cpp
        botan/mode_pad.h botan/modebase.cpp botan/modebase.h
        botan/modules.cpp botan/modules.h botan/mp_asm.cpp
        botan/mp_asm.h botan/mp_asmi.h botan/mp_comba.cpp
        botan/mp_core.h botan/mp_misc.cpp botan/mp_mul.cpp
        botan/mp_mulop.cpp botan/mp_numth.cpp botan/mp_shift.cpp
        botan/mp_sqr.cpp botan/mp_types.h botan/mutex.cpp
        botan/mutex.h botan/numthry.cpp botan/numthry.h
        botan/ofb.cpp botan/ofb.h botan/oids.cpp botan/oids.h
        botan/out_buf.cpp botan/out_buf.h botan/parsing.cpp
        botan/parsing.h botan/pbe.h botan/pbe_pkcs.h botan/pbes1.cpp
        botan/pbes2.cpp botan/pem.cpp botan/pem.h botan/pipe.cpp
        botan/pipe.h botan/pipe_io.cpp botan/pipe_rw.cpp
        botan/pk_algs.cpp botan/pk_algs.h botan/pk_core.cpp
        botan/pk_core.h botan/pk_filts.cpp botan/pk_filts.h
        botan/pk_keys.cpp botan/pk_keys.h botan/pk_ops.h
        botan/pk_util.cpp botan/pk_util.h botan/pkcs10.cpp
        botan/pkcs10.h botan/pkcs5.cpp botan/pkcs5.h botan/pkcs8.cpp
        botan/pkcs8.h botan/policy.cpp botan/pow_mod.cpp
        botan/pow_mod.h botan/powm_fw.cpp botan/powm_mnt.cpp
        botan/prf_x942.cpp botan/primes.cpp botan/pubkey.cpp
        botan/pubkey.h botan/randpool.cpp botan/randpool.h
        botan/reducer.cpp botan/reducer.h botan/rng.cpp botan/rng.h
        botan/rsa.cpp botan/rsa.h botan/s2k.cpp botan/s2k.h
        botan/secmem.h botan/secqueue.cpp botan/secqueue.h
        botan/sha160.cpp botan/sha160.h botan/sha256.cpp
        botan/sha256.h botan/stl_util.h botan/symkey.cpp
        botan/symkey.h botan/timers.cpp botan/timers.h botan/types.h
        botan/ui.cpp botan/ui.h botan/util.cpp botan/util.h
        botan/version.h botan/x509_ca.cpp botan/x509_ca.h
        botan/x509_crl.cpp botan/x509_crl.h botan/x509_ext.cpp
        botan/x509_ext.h botan/x509_key.cpp botan/x509_key.h
        botan/x509_obj.cpp botan/x509_obj.h botan/x509cert.cpp
        botan/x509cert.h botan/x509find.cpp botan/x509find.h
        botan/x509opt.cpp botan/x509self.cpp botan/x509self.h
        botan/x509stat.cpp botan/x509stat.h botan/x509stor.cpp
        botan/x509stor.h botan/x931_rng.cpp botan/x931_rng.h cert.cc
        cert.hh charset.cc charset.hh cmd.hh cmd_automate.cc
        cmd_db.cc cmd_diff_log.cc cmd_files.cc cmd_key_cert.cc
        cmd_list.cc cmd_merging.cc cmd_netsync.cc cmd_othervcs.cc
        cmd_packet.cc cmd_ws_commit.cc commands.cc commands.hh
        configure.ac constants.cc constants.hh contrib/README
        contrib/ciabot_monotone_hookversion.py
        contrib/ext_hooks_expand.pl contrib/monotone-notify.pl
        contrib/monotone.bash_completion
        contrib/monotone.zsh_completion crypto_tests.cc cset.cc
        cset.hh cycle_detector.hh database.cc database.hh
        database_check.cc dates.cc dates.hh debian/NEWS
        debian/changelog debian/control debian/copyright
        debian/monotone-doc.docs debian/monotone-doc.info
        debian/monotone-server.config
        debian/monotone-server.monotone.init
        debian/monotone-server.postinst
        debian/monotone-server.postrm debian/monotone.docs
        debian/rules debian/watch diff_patch.cc diff_patch.hh
        enumerator.cc enumerator.hh epoch.cc epoch.hh file_io.cc
        file_io.hh globish.cc globish.hh graph.cc graph.hh
        hash_map.hh hmac.cc hmac.hh idna/idn-int.h inodeprint.cc
        inodeprint.hh interner.hh key_store.cc key_store.hh keys.cc
        keys.hh lcs.cc lcs.hh legacy.cc legacy.hh
        lru_writeback_cache.hh lua/lcode.cc lua/ldebug.cc
        lua/lparser.cc lua/ltable.cc lua/lvm.cc lua-testsuite.lua
        lua.cc lua.hh lua_hooks.cc lua_hooks.hh luaext_globish.cc
        luaext_guess_binary.cc luaext_mkstemp.cc
        luaext_parse_basic_io.cc luaext_platform.cc m4/boost.m4
        m4/sqlite.m4 mac/readme-mac.txt merge.cc merkle_tree.cc
        merkle_tree.hh mkstemp.cc mkstemp.hh monotone.cc
        monotone.spec monotone.texi mt_version.cc mt_version.hh
        mtn-sanity.cc mtn-sanity.hh netcmd.cc netcmd.hh netsync.cc
        netxx/address.cxx netxx/peer.cxx netxx/probe_select.cxx
        netxx_pipe.cc netxx_pipe.hh notes/README.testing
        notes/release-checklist.txt notes/testsuite.txt
        numeric_vocab.cc numeric_vocab.hh option.cc option.hh
        options.cc options_list.hh outdated_indicator.cc packet.cc
        packet.hh parallel_iter.hh paths.cc paths.hh pch.hh
        platform-wrapped.hh platform.hh po/POTFILES.in po/README
        po/de.po po/es.po po/fr.po po/it.po po/ja.po po/pt_BR.po
        po/sv.po project.cc project.hh randomfile.hh randomizer.cc
        randomizer.hh rcs_file.cc rcs_file.hh rcs_import.cc
        refiner.cc restrictions.cc restrictions.hh rev_height.cc
        rev_height.hh revision.cc revision.hh roster.cc roster.hh
        roster_delta.cc roster_merge.cc roster_merge.hh safe_map.hh
        sanity.cc sanity.hh schema.sql schema_migration.cc
        schema_migration.hh selectors.cc selectors.hh sha1.cc
        sha1_engine.hh simplestring_xform.cc simplestring_xform.hh
        smap.hh sqlite/alter.c sqlite/analyze.c sqlite/attach.c
        sqlite/auth.c sqlite/btree.c sqlite/btree.h sqlite/build.c
        sqlite/callback.c sqlite/date.c sqlite/delete.c
        sqlite/expr.c sqlite/func.c sqlite/insert.c
        sqlite/keywordhash.h sqlite/legacy.c sqlite/loadext.c
        sqlite/main.c sqlite/opcodes.c sqlite/opcodes.h sqlite/os.c
        sqlite/os.h sqlite/os_common.h sqlite/os_os2.c
        sqlite/os_unix.c sqlite/os_win.c sqlite/pager.c
        sqlite/pager.h sqlite/parse.c sqlite/pragma.c
        sqlite/prepare.c sqlite/printf.c sqlite/select.c
        sqlite/sqlite3.h sqlite/sqlite3ext.h sqlite/sqliteInt.h
        sqlite/table.c sqlite/tokenize.c sqlite/trigger.c
        sqlite/update.c sqlite/utf.c sqlite/util.c sqlite/vdbe.c
        sqlite/vdbe.h sqlite/vdbeInt.h sqlite/vdbeapi.c
        sqlite/vdbeaux.c sqlite/vdbemem.c sqlite/vtab.c
        sqlite/where.c ssh_agent.cc ssh_agent.hh std_hooks.lua
        string_queue.cc string_queue.hh
        tester-tests/cleanup-1/__driver__.lua
        tester-tests/cleanup-2/__driver__.lua
        tester-tests/isolated-1/__driver__.lua tester-testsuite.lua
        tester.cc testlib.lua
        tests/annotate_accidental_clean_merge/__driver__.lua
        tests/annotate_file_whose_name_changed/__driver__.lua
        tests/annotate_where_line_splits/__driver__.lua
        tests/annotate_where_lineage_depends_on_traversal/__driver__.lua
        tests/annotate_where_one_parent_is_full_copy/__driver__.lua
        tests/automate_db_variables/__driver__.lua
        tests/automate_get_attributes/__driver__.lua
        tests/automate_inventory/__driver__.lua
        tests/check_that_--xargs_and_-(at)_behave_correctly/__driver__.lua
        tests/checkout_validates_target_directory/__driver__.lua
        tests/clone_validates_target_directory/__driver__.lua
        tests/clone_warning_with_multiple_heads/__driver__.lua
        tests/command_completion/__driver__.lua
        tests/db_kill_rev_locally/__driver__.lua
        tests/db_kill_rev_locally_and_recommit/__driver__.lua
        tests/diffing_a_file_within_revision_outside_a_workspace/__driver__.lua
        tests/empty_environment/__driver__.lua
        tests/fetching_nonexistent_entry_from_children_bug/__driver__.lua
        tests/importing_files_with_non-english_names/__driver__.lua
        tests/invalid_--root_settings/__driver__.lua
        tests/listing_changed_files/__driver__.lua
        tests/log_quits_on_SIGPIPE/hookfile
        tests/logging_a_file_within_revision_outside_a_workspace/__driver__.lua
        tests/merge_into_workspace/expected-log
        tests/merge_into_workspace/expected-log-left
        tests/netsync,--set-default/__driver__.lua
        tests/netsync_permissions_wildcards/__driver__.lua
        tests/netsync_verifies_server_keys/__driver__.lua
        tests/rename_file_to_dir/__driver__.lua
        tests/restrictions_with_renames_and_adds/__driver__.lua
        
tests/schema_migration/7ca81b45279403419581d7fde31ed888a80bd34e.mtn.dumped
        tests/schema_migration_error_recovery/__driver__.lua
        tests/spawn_redirected_hook_helper/__driver__.lua
        tests/test_a_merge_8/__driver__.lua
        tests/test_annotate_command/__driver__.lua
        tests/test_hooks.lua
        tests/test_the_help_command/__driver__.lua
        tests/things_in_.mtn-ignore_get_ignored/__driver__.lua
        tests/two_parent_workspace_commands_that_fail/__driver__.lua
        tests/usage_output_streams/__driver__.lua
        tests/ws_ops_with_wrong_node_type/__driver__.lua texinfo.css
        transforms.cc txt2c.cc ui.cc ui.hh unit_tests.cc
        unit_tests.hh unix/cputime.cc unix/fs.cc
        unix/get_system_flavour.cc unix/inodeprint.cc unix/main.cc
        unix/os_strerror.cc unix/process.cc unix/read_password.cc
        unix/ssh_agent_platform.cc unix/terminal.cc update.cc uri.cc
        uri.hh visualc/botan.vcproj visualc/config.h
        visualc/lua.vcproj visualc/monotone.sln
        visualc/monotone.vcproj visualc/netxx.vcproj
        visualc/sqlite3.vcproj visualc/stringprep.vcproj
        visualc/tester.vcproj visualc/txt2c.vcproj vocab.cc vocab.hh
        vocab_macros.hh vocab_terms.hh win32/README win32/cputime.cc
        win32/fs.cc win32/get_system_flavour.cc win32/inodeprint.cc
        win32/main.cc win32/make_io_binary.cc win32/monotone.iss
        win32/os_strerror.cc win32/process.cc win32/read_password.cc
        win32/ssh_agent_platform.cc win32/ssh_agent_platform.hh
        win32/terminal.cc work.cc work.hh work_migration.cc
        xdelta.cc xdelta.hh
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 win32/monotone.bmp

ChangeLog: 

propagate from branch 'net.venge.monotone' (head 
cc7f866bbfd2800324dbb7ff3781a614c4615f19)
            to branch 'net.venge.monotone.cvssync.refactor' (head 
067a177f2d6daee1774ea722651006574228bdea)


monotone --db={your.database} diff 
--revision=067a177f2d6daee1774ea722651006574228bdea 
--revision=75cb9278213902e6cc9ffac6e580bbc5464b6d06
monotone --db={your.database} diff 
--revision=cc7f866bbfd2800324dbb7ff3781a614c4615f19 
--revision=75cb9278213902e6cc9ffac6e580bbc5464b6d06
----------------------------------------------------------------------