[Monotone-commits-diffs] Revision dfaf66b65fea098878a27ffc855e4bfed0956f46

[monotone]

-----------------------------------------------------------------
Revision: dfaf66b65fea098878a27ffc855e4bfed0956f46
Ancestor: 5d970ce9d945518aa83840a7ee1b203260e5fc39
Ancestor: a0c3fb646aab593fe52eeb1664682b4544eaaf36
Author: address@hidden
Date: 2007-07-05T08:32:27
Branch: net.venge.monotone.cvsimport-branch-reconstruction

Deleted entries:
        m4/ax_create_stdint_h.m4
        tests/importing_cvs_tricky_repo_with_tags/test.manifest
        tests/importing_cvs_tricky_repo_with_tags/test.tags
Added files:
        audit-includes base.hh contrib/mtn_makepermissions
        contrib/serverctl-update.lua contrib/serverctl-update.sh
        contrib/serverctl.lua debian/po/nl.po m4/numeric_vocab.m4
        tests/importing_cvs_branch_from_empty_branch/__driver__.lua
        tests/importing_cvs_branch_from_empty_branch/cvs-repository/test/fileA,v
        tests/importing_cvs_branch_from_empty_branch/cvs-repository/test/fileB,v
        tests/importing_cvs_branch_from_empty_branch/cvs-repository/test/fileC,v
        tests/importing_cvs_branch_from_empty_branch/cvs-repository/test/fileD,v
        tests/importing_cvs_branch_from_empty_branch/makerepo.sh
        tests/importing_cvs_branches2/__driver__.lua
        tests/importing_cvs_branches2/cvs-repository/test/Attic/file3,v
        tests/importing_cvs_branches2/cvs-repository/test/changelog,v
        tests/importing_cvs_branches2/cvs-repository/test/file1,v
        tests/importing_cvs_branches2/cvs-repository/test/file2,v
        tests/importing_cvs_branches2/makerepo.sh
        tests/importing_cvs_dryrun/__driver__.lua
        tests/importing_cvs_dryrun/cvs-repository/test/foo,v
        tests/importing_cvs_dryrun/makerepo.sh
        tests/importing_cvs_files_with_identical_logs2/__driver__.lua
        tests/importing_cvs_files_with_identical_logs2/cvs-repository/test/foo,v
        tests/importing_cvs_files_with_identical_logs2/makerepo.sh
        tests/importing_cvs_with_conflicting_tag/__driver__.lua
        tests/importing_cvs_with_conflicting_tag/cvs-repository/testsrc/fileA,v
        tests/importing_cvs_with_conflicting_tag/cvs-repository/testsrc/fileB,v
        tests/importing_cvs_with_missing_delta/__driver__.lua
        tests/importing_cvs_with_missing_delta/cvs-repository/fileA,v
        tests/importing_cvs_with_multiple_unnamed_branches/__driver__.lua
        
tests/importing_cvs_with_multiple_unnamed_branches/cvs-repository/fileA,v
        tests/importing_cvs_with_multiple_vendor_imports/__driver__.lua
        
tests/importing_cvs_with_multiple_vendor_imports/cvs-repository/test/fileA,v
        
tests/importing_cvs_with_multiple_vendor_imports/cvs-repository/test/fileB,v
        
tests/importing_cvs_with_multiple_vendor_imports/cvs-repository/test/fileC,v
        tests/importing_cvs_with_multiple_vendor_imports/makerepo.sh
        tests/importing_cvs_with_tags_after_delete/__driver__.lua
        
tests/importing_cvs_with_tags_after_delete/cvs-repository/test/Attic/bar,v
        tests/importing_cvs_with_tags_after_delete/cvs-repository/test/foo,v
        tests/importing_cvs_with_tags_after_delete/makerepo.sh
        tests/importing_cvs_with_unnamed_branch/__driver__.lua
        tests/importing_cvs_with_unnamed_branch/cvs-repository/fileA,v
        tests/keydir_defaults_to_under_confdir/__driver__.lua
        tests/netsync_key_hook/__driver__.lua
        tests/netsync_key_hook/client-hooks.lua
        tests/netsync_key_hook/read-permissions
        tests/server_initiated_sync/__driver__.lua
        tests/server_initiated_sync/server1.rc
Added directories:
        tests/importing_cvs_branch_from_empty_branch
        tests/importing_cvs_branch_from_empty_branch/cvs-repository
        tests/importing_cvs_branch_from_empty_branch/cvs-repository/test
        tests/importing_cvs_branches2
        tests/importing_cvs_branches2/cvs-repository
        tests/importing_cvs_branches2/cvs-repository/test
        tests/importing_cvs_branches2/cvs-repository/test/Attic
        tests/importing_cvs_dryrun
        tests/importing_cvs_dryrun/cvs-repository
        tests/importing_cvs_dryrun/cvs-repository/test
        tests/importing_cvs_files_with_identical_logs2
        tests/importing_cvs_files_with_identical_logs2/cvs-repository
        tests/importing_cvs_files_with_identical_logs2/cvs-repository/test
        tests/importing_cvs_with_conflicting_tag
        tests/importing_cvs_with_conflicting_tag/cvs-repository
        tests/importing_cvs_with_conflicting_tag/cvs-repository/testsrc
        tests/importing_cvs_with_missing_delta
        tests/importing_cvs_with_missing_delta/cvs-repository
        tests/importing_cvs_with_multiple_unnamed_branches
        tests/importing_cvs_with_multiple_unnamed_branches/cvs-repository
        tests/importing_cvs_with_multiple_vendor_imports
        tests/importing_cvs_with_multiple_vendor_imports/cvs-repository
        tests/importing_cvs_with_multiple_vendor_imports/cvs-repository/test
        tests/importing_cvs_with_tags_after_delete
        tests/importing_cvs_with_tags_after_delete/cvs-repository
        tests/importing_cvs_with_tags_after_delete/cvs-repository/test
        tests/importing_cvs_with_tags_after_delete/cvs-repository/test/Attic
        tests/importing_cvs_with_unnamed_branch
        tests/importing_cvs_with_unnamed_branch/cvs-repository
        tests/keydir_defaults_to_under_confdir
        tests/netsync_key_hook tests/server_initiated_sync
Modified files:
        AUTHORS HACKING INSTALL Makefile.am NEWS adler32.hh
        annotate.cc app_state.cc asciik.cc asciik.hh automate.cc
        basic_io.cc basic_io.hh cert.cc charset.cc 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/usher.cc crypto_tests.cc cset.cc
        cset.hh current_exception.hh database.cc database.hh
        database_check.cc dates.cc dates.hh debian/changelog
        debian/control diff_patch.cc diff_patch.hh enumerator.cc
        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 interner.hh key_store.cc
        key_store.hh keys.cc keys.hh lcs.cc legacy.cc legacy.hh
        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 merge.cc
        merkle_tree.cc merkle_tree.hh mkstemp.cc mkstemp.hh
        monotone.cc monotone.texi mt_version.cc mt_version.hh
        mtn-sanity.cc netcmd.cc netcmd.hh netsync.cc netxx_pipe.cc
        netxx_pipe.hh numeric_vocab.cc numeric_vocab.hh option.cc
        option.hh options.cc outdated_indicator.cc packet.cc
        packet.hh parallel_iter.hh paths.cc paths.hh platform.hh
        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
        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 sanity.cc sanity.hh
        schema_migration.cc schema_migration.hh selectors.cc
        selectors.hh sha1.cc sha1_engine.hh simplestring_xform.cc
        simplestring_xform.hh specialized_lexical_cast.cc
        ssh_agent.cc string_queue.cc string_queue.hh tester.cc
        tests/common/netsync.lua
        tests/importing_cvs_branches/__driver__.lua
        tests/importing_cvs_tricky_repo_with_tags/__driver__.lua
        tests/netsync_permissions_wildcards/__driver__.lua
        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/monotone.vcproj visualc/tester.vcproj
        vocab.cc vocab.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/terminal.cc work.cc
        work.hh work_migration.cc xdelta.cc xdelta.hh
Modified attrs:
        contrib/serverctl-update.sh
        tests/importing_cvs_branch_from_empty_branch/makerepo.sh
        tests/importing_cvs_branches2/makerepo.sh
        tests/importing_cvs_dryrun/makerepo.sh
        tests/importing_cvs_files_with_identical_logs2/makerepo.sh
        tests/importing_cvs_with_multiple_vendor_imports/makerepo.sh
        tests/importing_cvs_with_tags_after_delete/makerepo.sh

ChangeLog: 

propagate from branch 'net.venge.monotone' (head 
a0c3fb646aab593fe52eeb1664682b4544eaaf36)
            to branch 'net.venge.monotone.cvsimport-branch-reconstruction' 
(head 5d970ce9d945518aa83840a7ee1b203260e5fc39)


monotone --db={your.database} diff 
--revision=5d970ce9d945518aa83840a7ee1b203260e5fc39 
--revision=dfaf66b65fea098878a27ffc855e4bfed0956f46
monotone --db={your.database} diff 
--revision=a0c3fb646aab593fe52eeb1664682b4544eaaf36 
--revision=dfaf66b65fea098878a27ffc855e4bfed0956f46
----------------------------------------------------------------------