[Monotone-commits-diffs] Revision 814dc20d450361a1f88061bea3326df20a2320da

[monotone]

-----------------------------------------------------------------
Revision: 814dc20d450361a1f88061bea3326df20a2320da
Ancestor: 3763a27ee961af0cc45df439241eda0a2bf800c6
Ancestor: d69e724669e55aa2467117c1c96032948627f0ac
Author: address@hidden
Date: 2007-08-18T08:52:17
Branch: net.venge.monotone.cvsimport-branch-reconstruction

Deleted entries:
        tests/importing_cvs_tricky_repo_with_tags/test.manifest
        tests/importing_cvs_tricky_repo_with_tags/test.tags
Renamed entries:
        testsuite.lua to lua-testsuite.lua
Added files:
        tester-plaf.hh
        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_cycle_splitter1/__driver__.lua
        tests/importing_cvs_cycle_splitter1/cvs-repository/test/bar,v
        tests/importing_cvs_cycle_splitter1/cvs-repository/test/foo,v
        tests/importing_cvs_cycle_splitter1/makerepo.sh
        tests/importing_cvs_cycle_splitter2/__driver__.lua
        tests/importing_cvs_cycle_splitter2/cvs-repository/test/bar,v
        tests/importing_cvs_cycle_splitter2/cvs-repository/test/foo,v
        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_files_with_identical_logs3/__driver__.lua
        tests/importing_cvs_files_with_identical_logs3/cvs-repository/test/foo,v
        tests/importing_cvs_files_with_identical_logs3/makerepo.sh
        tests/importing_cvs_timing_check/__driver__.lua
        tests/importing_cvs_timing_check/cvs-repository/test/bar,v
        tests/importing_cvs_timing_check/cvs-repository/test/foo,v
        tests/importing_cvs_timing_check/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
        unit-testsuite.lua unix/tester-plaf.cc vector.hh
        win32/tester-plaf.cc
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_cycle_splitter1
        tests/importing_cvs_cycle_splitter1/cvs-repository
        tests/importing_cvs_cycle_splitter1/cvs-repository/test
        tests/importing_cvs_cycle_splitter2
        tests/importing_cvs_cycle_splitter2/cvs-repository
        tests/importing_cvs_cycle_splitter2/cvs-repository/test
        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_files_with_identical_logs3
        tests/importing_cvs_files_with_identical_logs3/cvs-repository
        tests/importing_cvs_files_with_identical_logs3/cvs-repository/test
        tests/importing_cvs_timing_check
        tests/importing_cvs_timing_check/cvs-repository
        tests/importing_cvs_timing_check/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
Modified files:
        AUTHORS Makefile.am app_state.cc app_state.hh asciik.hh
        automate.cc basic_io.hh cert.cc cert.hh charset.cc
        cmd_othervcs.cc commands.hh contrib/Monotone.pm cset.hh
        cycle_detector.hh database.cc database.hh diff_patch.cc
        diff_patch.hh enumerator.cc enumerator.hh graph.hh
        key_store.hh lcs.cc lcs.hh lua-testsuite.lua lua.cc
        merkle_tree.hh monotone.cc mtn-sanity.cc netcmd.cc netcmd.hh
        netsync.cc netxx_pipe.cc netxx_pipe.hh option.hh
        options_list.hh paths.cc paths.hh project.cc randomfile.hh
        rcs_file.cc rcs_file.hh rcs_import.cc restrictions.cc
        revision.cc roster.cc sanity.cc sanity.hh selectors.hh
        simplestring_xform.cc simplestring_xform.hh smap.hh
        sqlite/btree.c sqlite/expr.c sqlite/func.c sqlite/insert.c
        sqlite/keywordhash.h sqlite/main.c sqlite/malloc.c
        sqlite/os_common.h sqlite/os_unix.c sqlite/pager.c
        sqlite/prepare.c sqlite/sqlite3.h sqlite/sqliteInt.h
        sqlite/tokenize.c sqlite/trigger.c sqlite/utf.c
        sqlite/vdbe.c sqlite/vdbeapi.c sqlite/vdbeaux.c
        sqlite/where.c ssh_agent.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/importing_cvs_branches/__driver__.lua
        tests/importing_cvs_small_real_repo/test.manifest
        tests/importing_cvs_tricky_repo_with_tags/__driver__.lua
        transforms.cc ui.cc ui.hh unit_tests.cc unit_tests.hh
        unix/get_system_flavour.cc update.cc xdelta.cc
Modified attrs:
        tests/importing_cvs_branch_from_empty_branch/makerepo.sh
        tests/importing_cvs_branches2/makerepo.sh
        tests/importing_cvs_cycle_splitter1/makerepo.sh
        tests/importing_cvs_dryrun/makerepo.sh
        tests/importing_cvs_files_with_identical_logs2/makerepo.sh
        tests/importing_cvs_files_with_identical_logs3/makerepo.sh
        tests/importing_cvs_timing_check/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 
3763a27ee961af0cc45df439241eda0a2bf800c6)
            to branch 'net.venge.monotone.cvsimport-branch-reconstruction' 
(head d69e724669e55aa2467117c1c96032948627f0ac)


monotone --db={your.database} diff 
--revision=3763a27ee961af0cc45df439241eda0a2bf800c6 
--revision=814dc20d450361a1f88061bea3326df20a2320da
monotone --db={your.database} diff 
--revision=d69e724669e55aa2467117c1c96032948627f0ac 
--revision=814dc20d450361a1f88061bea3326df20a2320da
----------------------------------------------------------------------