[Monotone-commits-diffs] Revision 5cc19b5d0ee157d810320707ab9dedc9d52726cc

[monotone]

-----------------------------------------------------------------
Revision: 5cc19b5d0ee157d810320707ab9dedc9d52726cc
Ancestor: 8b205b55e07269fcf57a2896f81002a8a355e244
Ancestor: cf482cbf111405919223dc4413ccc29831ba8d3f
Author: address@hidden
Date: 2009-02-26T13:32:25
Branch: net.venge.monotone.cvssync.refactor

Deleted entries:
        i18n.h indent_script m4/acx_pthread.m4 m4/fexception.m4
        m4/iconv_translit.m4 m4/localeworks.m4 m4/pcre.m4
        m4/sqlite.m4 m4/xgettextflag.m4 mkstemp.hh
        package_full_revision.h package_revision.h po/POTFILES.in
        po/POTFILES.skip po/remove-potcdate.sin
        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
Renamed entries:
        botan to Attic/botan
        crypto_tests.cc to unit-tests/sha1.cc
        diff_patch.cc to diff_output.cc
        diff_patch.hh to diff_output.hh
        idna to Attic/idna
        lua to Attic/lua
        merge.cc to merge_content.cc
        merge.hh to merge_content.hh
        numeric_vocab.cc to unit-tests/numeric_vocab.cc
        pcre to Attic/pcre
        pcre/pcrepattern.texi to pcrepattern.texi
        pcre/pcresyntax.texi to pcresyntax.texi
        roster_merge.cc to merge_roster.cc
        roster_merge.hh to merge_roster.hh
        schema_migration.cc to migrate_schema.cc
        schema_migration.hh to migration.hh
        sha1.hh to Attic/sha1.hh
        sha1_engine.hh to Attic/sha1_engine.hh
        sqlite to Attic/sqlite
        string_queue.cc to unit-tests/string_queue.cc
        unit_tests.cc to unit_tester.cc
        unix/tester-check-net.c to unix/tester-check-net.cc
        win32/tester-check-net.c to win32/tester-check-net.cc
        work_migration.cc to migrate_work.cc
Added files:
        ancestry.cc cmd.cc lazy_rng.hh m4/library.m4
        m4/mtn-gettext.m4 merge_3way.cc merge_conflict.cc
        migrate_ancestry.cc mtn_cvs/.cproject mtn_cvs/.project
        mtn_cvs/CVS_prot mtn_cvs/Makefile.am mtn_cvs/TODO
        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/cvs_sync_pull.cc mtn_cvs/cvs_sync_push.cc
        mtn_cvs/cvs_sync_takeover.cc mtn_cvs/lua-testsuite.lua
        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
        roster_tests.hh tests/automate_sync_info/__driver__.lua
        unit-tests/basic_io.cc unit-tests/charset.cc
        unit-tests/commands.cc unit-tests/cset.cc
        unit-tests/dates.cc unit-tests/globish.cc
        unit-tests/graph.cc unit-tests/merge_3way.cc
        unit-tests/merge_roster.cc unit-tests/mkstemp.cc
        unit-tests/netcmd.cc unit-tests/netxx_pipe.cc
        unit-tests/option.cc unit-tests/outdated_indicator.cc
        unit-tests/packet.cc unit-tests/paths.cc
        unit-tests/refiner.cc unit-tests/restrictions.cc
        unit-tests/rev_height.cc unit-tests/revision.cc
        unit-tests/roster.cc unit-tests/simplestring_xform.cc
        unit-tests/transforms.cc unit-tests/uri.cc
        unit-tests/vocab.cc unit-tests/xdelta.cc
Added directories:
        Attic 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 tests/automate_sync_info
        unit-tests
Modified files:
        .mtn-ignore AUTHORS Attic/sha1_engine.hh INSTALL Makefile.am
        NEWS adler32.hh annotate.cc annotate.hh app_state.cc
        app_state.hh asciik.cc asciik.hh audit-includes automate.cc
        base.hh basic_io.cc basic_io.hh botan_pipe_cache.hh cert.cc
        cert.hh char_classifiers.hh charset.cc charset.hh cleanup.hh
        cmd.hh cmd_automate.cc cmd_conflicts.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.hh cset.cc cset.hh current_exception.hh
        cycle_detector.hh database.cc database.hh database_check.cc
        dates.cc diff_output.cc diff_output.hh do-editor-vars.sh
        enumerator.cc enumerator.hh epoch.hh file_io.cc file_io.hh
        globish.cc globish.hh graph.cc graph.hh gzip.cc gzip.hh
        hash_map.hh hmac.cc hmac.hh hybrid_map.hh inodeprint.cc
        inodeprint.hh interner.hh key_store.cc key_store.hh keys.cc
        keys.hh lcs.cc lcs.hh legacy.hh lexical_cast.hh
        lru_writeback_cache.hh 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/inaddrnone.m4 m4/netxx.m4 m4/numeric_vocab.m4 m4/pkg.m4
        m4/stlporthashmap.m4 m4/syncwithstdio.m4 m4/tempstatconst.m4
        m4/typeof.m4 merge_content.cc merge_content.hh
        merge_roster.cc merge_roster.hh merkle_tree.cc
        merkle_tree.hh migrate_schema.cc migrate_work.cc
        migration.hh mkstemp.cc monotone.cc monotone.texi
        mt_version.cc mt_version.hh mtn-sanity.cc mtn-sanity.hh
        netcmd.cc netcmd.hh netio.hh netsync.cc netxx_pipe.cc
        netxx_pipe.hh numeric_vocab.hh option.cc option.hh
        options.cc options.hh options_list.hh origin_type.hh
        outdated_indicator.cc outdated_indicator.hh packet.cc
        packet.hh parallel_iter.hh paths.cc paths.hh pch.hh
        platform-wrapped.hh platform.hh po/Makevars po/README
        po/de.po po/it.po project.cc project.hh quick_alloc.hh
        randomfile.hh randomizer.cc randomizer.hh rcs_file.cc
        rcs_file.hh rcs_import.cc rcs_import.hh refiner.cc
        refiner.hh restrictions.cc restrictions.hh rev_height.cc
        rev_height.hh rev_types.hh revision.cc revision.hh roster.cc
        roster.hh roster_delta.cc roster_delta.hh safe_map.hh
        sanity.cc sanity.hh schema.sql selectors.cc selectors.hh
        sha1.cc simplestring_xform.cc simplestring_xform.hh
        ssh_agent.cc ssh_agent.hh std_hooks.lua string_queue.hh
        tester-plaf.hh tester-tests/cleanup-1/__driver__.lua
        tester-tests/cleanup-2/__driver__.lua
        tester-tests/isolated-1/__driver__.lua
        tester-tests/isolated-2/__driver__.lua
        tester-tests/remove-unwriteable/__driver__.lua
        tester-testsuite.lua tester.cc testlib.lua
        tests/dump_on_crash/__driver__.lua
        tests/empty_environment/__driver__.lua
        tests/fail_cleanly_on_unreadable_db/__driver__.lua
        tests/inventory_hooks.lua
        tests/log_--last=N_--next=N/__driver__.lua
        tests/log_--last=N_FILENAME/__driver__.lua
        tests/log_dir/__driver__.lua
        tests/log_with_restriction/__driver__.lua
        tests/min_hooks.lua tests/p_selector/__driver__.lua
        tests/ssh_agent/__driver__.lua tests/test_hooks.lua
        transforms.cc transforms.hh txt2c.cc ui.cc ui.hh
        unit-tests/numeric_vocab.cc unit-tests/sha1.cc
        unit-tests/string_queue.cc unit-testsuite.lua unit_tester.cc
        unit_tests.hh unix/cputime.cc unix/fs.cc
        unix/get_system_flavour.cc unix/inodeprint.cc unix/main.cc
        unix/make_io_binary.cc unix/os_strerror.cc unix/process.cc
        unix/read_password.cc unix/ssh_agent_platform.cc
        unix/ssh_agent_platform.hh unix/terminal.cc
        unix/tester-check-net.cc unix/tester-plaf.cc update.cc
        update.hh uri.cc uri.hh util/mtnopt.in vector.hh vocab.cc
        vocab.hh vocab_cast.hh vocab_hash.hh vocab_macros.hh
        vocab_terms.hh win32/cputime.cc win32/fs.cc
        win32/get_system_flavour.cc win32/inodeprint.cc
        win32/main.cc win32/make_io_binary.cc win32/os_strerror.cc
        win32/process.cc win32/read_password.cc
        win32/ssh_agent_platform.cc win32/ssh_agent_platform.hh
        win32/terminal.cc win32/tester-check-net.cc
        win32/tester-plaf.cc work.cc work.hh xdelta.cc xdelta.hh
Modified attrs:
        mtn_cvs/lua-testsuite.lua 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
        util/mtnopt.in

ChangeLog: 

propagate from branch 'net.venge.monotone' (head 
8b205b55e07269fcf57a2896f81002a8a355e244)
            to branch 'net.venge.monotone.cvssync.refactor' (head 
cf482cbf111405919223dc4413ccc29831ba8d3f)


monotone --db={your.database} diff 
--revision=8b205b55e07269fcf57a2896f81002a8a355e244 
--revision=5cc19b5d0ee157d810320707ab9dedc9d52726cc
monotone --db={your.database} diff 
--revision=cf482cbf111405919223dc4413ccc29831ba8d3f 
--revision=5cc19b5d0ee157d810320707ab9dedc9d52726cc
----------------------------------------------------------------------