[Monotone-commits-diffs] Revision a24db2cadfa1f50bd21b41035559a74b786dbbcf

[monotone]

-----------------------------------------------------------------
Revision: a24db2cadfa1f50bd21b41035559a74b786dbbcf
Ancestor: b1384995491837f299f6e58cfbd1c09d62fd3553
Ancestor: db9c1600beb57a51d91a18ab7d3dab8d62f7b3d7
Author: address@hidden
Date: 2008-09-08T09:52:25
Branch: net.venge.monotone.cvsimport-branch-reconstruction

Deleted entries:
        ROADMAP smap.hh
        tests/importing_cvs_tricky_repo_with_tags/test.manifest
        tests/importing_cvs_tricky_repo_with_tags/test.tags
Renamed entries:
        util/mtnopt to util/mtnopt.in
Added files:
        tests/importing_cvs_attic_duplicate/__driver__.lua
        tests/importing_cvs_attic_duplicate/cvs-repository/test/Attic/foo,v
        tests/importing_cvs_attic_duplicate/cvs-repository/test/foo,v
        tests/importing_cvs_attic_duplicate/makerepo.sh
        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_branches3/__driver__.lua
        tests/importing_cvs_branches3/cvs-repository/test/file1,v
        tests/importing_cvs_branches3/cvs-repository/test/file2,v
        tests/importing_cvs_branches3/makerepo.sh
        tests/importing_cvs_branches4/__driver__.lua
        tests/importing_cvs_branches4/cvs-repository/test/file1,v
        tests/importing_cvs_branches4/cvs-repository/test/file2,v
        tests/importing_cvs_branches4/makerepo.sh
        tests/importing_cvs_branches5/__driver__.lua
        tests/importing_cvs_branches5/cvs-repository/test/file1,v
        tests/importing_cvs_branches5/cvs-repository/test/file2,v
        tests/importing_cvs_branches5/makerepo.sh
        tests/importing_cvs_branches6/__driver__.lua
        tests/importing_cvs_branches6/cvs-repository/test/file1,v
        tests/importing_cvs_branches6/cvs-repository/test/file2,v
        tests/importing_cvs_branches7/__driver__.lua
        tests/importing_cvs_branches7/cvs-repository/test/file1,v
        tests/importing_cvs_branches7/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_cycle_splitter3/__driver__.lua
        tests/importing_cvs_cycle_splitter3/cvs-repository/test/file1,v
        tests/importing_cvs_cycle_splitter3/cvs-repository/test/file2,v
        tests/importing_cvs_cycle_splitter4/__driver__.lua
        tests/importing_cvs_cycle_splitter4/cvs-repository/test/file1,v
        tests/importing_cvs_cycle_splitter4/cvs-repository/test/file2,v
        tests/importing_cvs_cycle_splitter4/cvs-repository/test/file3,v
        tests/importing_cvs_cycle_splitter5/__driver__.lua
        tests/importing_cvs_cycle_splitter5/cvs-repository/test/file1,v
        tests/importing_cvs_cycle_splitter5/cvs-repository/test/file1b,v
        tests/importing_cvs_cycle_splitter5/cvs-repository/test/file1c,v
        tests/importing_cvs_cycle_splitter5/cvs-repository/test/file2,v
        tests/importing_cvs_cycle_splitter5/cvs-repository/test/file2b,v
        tests/importing_cvs_cycle_splitter5/cvs-repository/test/file2c,v
        tests/importing_cvs_cycle_splitter5/cvs-repository/test/file3,v
        tests/importing_cvs_cycle_splitter5/cvs-repository/test/file3b,v
        tests/importing_cvs_cycle_splitter5/cvs-repository/test/file3c,v
        tests/importing_cvs_cycle_splitter6/__driver__.lua
        tests/importing_cvs_cycle_splitter6/cvs-repository/test/file1,v
        tests/importing_cvs_cycle_splitter6/cvs-repository/test/file1b,v
        tests/importing_cvs_cycle_splitter6/cvs-repository/test/file1c,v
        tests/importing_cvs_cycle_splitter6/cvs-repository/test/file2,v
        tests/importing_cvs_cycle_splitter6/cvs-repository/test/file2b,v
        tests/importing_cvs_cycle_splitter6/cvs-repository/test/file2c,v
        tests/importing_cvs_cycle_splitter6/cvs-repository/test/file3,v
        tests/importing_cvs_cycle_splitter6/cvs-repository/test/file3b,v
        tests/importing_cvs_cycle_splitter6/cvs-repository/test/file3c,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_charset/__driver__.lua
        tests/importing_cvs_files_charset/cvs-repository/test/foo,v
        tests/importing_cvs_files_charset/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_files_with_identical_time/__driver__.lua
        tests/importing_cvs_files_with_identical_time/cvs-repository/test/foo,v
        tests/importing_cvs_ignore_symbol/__driver__.lua
        tests/importing_cvs_ignore_symbol/cvs-repository/test/foo,v
        tests/importing_cvs_ignore_symbol/ignhook.lua
        tests/importing_cvs_ignore_symbol/makerepo.sh
        tests/importing_cvs_missing_delta_1/__driver__.lua
        tests/importing_cvs_missing_delta_1/cvs-repository/fileA,v
        tests/importing_cvs_missing_delta_2/__driver__.lua
        tests/importing_cvs_missing_delta_2/cvs-repository/test/foo,v
        tests/importing_cvs_successive/__driver__.lua
        tests/importing_cvs_successive/cvs-repository/test/file1,v
        tests/importing_cvs_successive/cvs-repository/test/file2,v
        tests/importing_cvs_successive/cvs-repository-snap/test/file1,v
        tests/importing_cvs_successive/cvs-repository-snap/test/file2,v
        tests/importing_cvs_successive/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_conflicting_tag2/__driver__.lua
        tests/importing_cvs_with_conflicting_tag2/cvs-repository/test/fileA,v
        tests/importing_cvs_with_conflicting_tag2/cvs-repository/test/fileB,v
        tests/importing_cvs_with_conflicting_tag2/cvs-repository/test/fileC,v
        tests/importing_cvs_with_conflicting_tag2/cvs-repository/test/fileD,v
        tests/importing_cvs_with_conflicting_tag2/cvs-repository/test/fileE,v
        tests/importing_cvs_with_conflicting_tag2/cvs-repository/test/fileF,v
        tests/importing_cvs_with_conflicting_tag2/makerepo.sh
        tests/importing_cvs_with_conflicting_tag3/__driver__.lua
        tests/importing_cvs_with_conflicting_tag3/cvs-repository/test/file1,v
        tests/importing_cvs_with_conflicting_tag3/cvs-repository/test/file2,v
        tests/importing_cvs_with_conflicting_tag3/makerepo.sh
        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_multiple_vendor_imports2/__driver__.lua
        
tests/importing_cvs_with_multiple_vendor_imports2/cvs-repository/test/fileA,v
        
tests/importing_cvs_with_multiple_vendor_imports2/cvs-repository/test/fileB,v
        
tests/importing_cvs_with_multiple_vendor_imports2/cvs-repository/test/fileC,v
        tests/importing_cvs_with_multiple_vendor_imports2/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_tags_after_delete2/__driver__.lua
        
tests/importing_cvs_with_tags_after_delete2/cvs-repository/test/Attic/bar,v
        tests/importing_cvs_with_tags_after_delete2/cvs-repository/test/foo,v
        tests/importing_cvs_with_unnamed_branch/__driver__.lua
        tests/importing_cvs_with_unnamed_branch/cvs-repository/fileA,v
        tests/ls_duplicates_with_duplicates/__driver__.lua
        tests/ls_duplicates_with_workspace/__driver__.lua
        tests/ls_duplicates_without_duplicates/__driver__.lua
Added directories:
        tests/importing_cvs_attic_duplicate
        tests/importing_cvs_attic_duplicate/cvs-repository
        tests/importing_cvs_attic_duplicate/cvs-repository/test
        tests/importing_cvs_attic_duplicate/cvs-repository/test/Attic
        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_branches3
        tests/importing_cvs_branches3/cvs-repository
        tests/importing_cvs_branches3/cvs-repository/test
        tests/importing_cvs_branches4
        tests/importing_cvs_branches4/cvs-repository
        tests/importing_cvs_branches4/cvs-repository/test
        tests/importing_cvs_branches5
        tests/importing_cvs_branches5/cvs-repository
        tests/importing_cvs_branches5/cvs-repository/test
        tests/importing_cvs_branches6
        tests/importing_cvs_branches6/cvs-repository
        tests/importing_cvs_branches6/cvs-repository/test
        tests/importing_cvs_branches7
        tests/importing_cvs_branches7/cvs-repository
        tests/importing_cvs_branches7/cvs-repository/test
        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_cycle_splitter3
        tests/importing_cvs_cycle_splitter3/cvs-repository
        tests/importing_cvs_cycle_splitter3/cvs-repository/test
        tests/importing_cvs_cycle_splitter4
        tests/importing_cvs_cycle_splitter4/cvs-repository
        tests/importing_cvs_cycle_splitter4/cvs-repository/test
        tests/importing_cvs_cycle_splitter5
        tests/importing_cvs_cycle_splitter5/cvs-repository
        tests/importing_cvs_cycle_splitter5/cvs-repository/test
        tests/importing_cvs_cycle_splitter6
        tests/importing_cvs_cycle_splitter6/cvs-repository
        tests/importing_cvs_cycle_splitter6/cvs-repository/test
        tests/importing_cvs_dryrun
        tests/importing_cvs_dryrun/cvs-repository
        tests/importing_cvs_dryrun/cvs-repository/test
        tests/importing_cvs_files_charset
        tests/importing_cvs_files_charset/cvs-repository
        tests/importing_cvs_files_charset/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_files_with_identical_time
        tests/importing_cvs_files_with_identical_time/cvs-repository
        tests/importing_cvs_files_with_identical_time/cvs-repository/test
        tests/importing_cvs_ignore_symbol
        tests/importing_cvs_ignore_symbol/cvs-repository
        tests/importing_cvs_ignore_symbol/cvs-repository/test
        tests/importing_cvs_missing_delta_1
        tests/importing_cvs_missing_delta_1/cvs-repository
        tests/importing_cvs_missing_delta_2
        tests/importing_cvs_missing_delta_2/cvs-repository
        tests/importing_cvs_missing_delta_2/cvs-repository/test
        tests/importing_cvs_successive
        tests/importing_cvs_successive/cvs-repository
        tests/importing_cvs_successive/cvs-repository/test
        tests/importing_cvs_successive/cvs-repository-snap
        tests/importing_cvs_successive/cvs-repository-snap/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_conflicting_tag2
        tests/importing_cvs_with_conflicting_tag2/cvs-repository
        tests/importing_cvs_with_conflicting_tag2/cvs-repository/test
        tests/importing_cvs_with_conflicting_tag3
        tests/importing_cvs_with_conflicting_tag3/cvs-repository
        tests/importing_cvs_with_conflicting_tag3/cvs-repository/test
        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_multiple_vendor_imports2
        tests/importing_cvs_with_multiple_vendor_imports2/cvs-repository
        tests/importing_cvs_with_multiple_vendor_imports2/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_tags_after_delete2
        tests/importing_cvs_with_tags_after_delete2/cvs-repository
        tests/importing_cvs_with_tags_after_delete2/cvs-repository/test
        tests/importing_cvs_with_tags_after_delete2/cvs-repository/test/Attic
        tests/importing_cvs_with_unnamed_branch
        tests/importing_cvs_with_unnamed_branch/cvs-repository
        tests/ls_duplicates_with_duplicates
        tests/ls_duplicates_with_workspace
        tests/ls_duplicates_without_duplicates
Modified files:
        AUTHORS Makefile.am NEWS README UPGRADE app_state.cc
        app_state.hh cmd_db.cc cmd_list.cc cmd_othervcs.cc
        configure.ac database.cc database.hh dates.cc dates.hh
        debian/changelog debian/control
        debian/monotone-server.postinst lua_hooks.cc lua_hooks.hh
        monotone.spec monotone.texi notes/release-checklist.txt
        options_list.hh paths.hh rcs_file.cc rcs_file.hh
        rcs_import.cc rcs_import.hh roster_merge.cc
        tests/importing_cvs_branches/__driver__.lua
        tests/importing_cvs_problematic_repo/__driver__.lua
        tests/importing_cvs_small_real_repo/test.manifest
        tests/importing_cvs_tricky_repo_with_tags/__driver__.lua
        tests/util_mtnopt/__driver__.lua transforms.cc
        util/mtnopt.in visualc/config.h win32/monotone.iss
Modified attrs:
        tests/importing_cvs_attic_duplicate/makerepo.sh
        tests/importing_cvs_branch_from_empty_branch/makerepo.sh
        tests/importing_cvs_branches2/makerepo.sh
        tests/importing_cvs_branches3/makerepo.sh
        tests/importing_cvs_branches4/makerepo.sh
        tests/importing_cvs_branches5/makerepo.sh
        tests/importing_cvs_branches7/makerepo.sh
        tests/importing_cvs_cycle_splitter1/makerepo.sh
        tests/importing_cvs_dryrun/makerepo.sh
        tests/importing_cvs_files_charset/makerepo.sh
        tests/importing_cvs_files_with_identical_logs2/makerepo.sh
        tests/importing_cvs_files_with_identical_logs3/makerepo.sh
        tests/importing_cvs_ignore_symbol/makerepo.sh
        tests/importing_cvs_successive/makerepo.sh
        tests/importing_cvs_timing_check/makerepo.sh
        tests/importing_cvs_with_conflicting_tag2/makerepo.sh
        tests/importing_cvs_with_conflicting_tag3/makerepo.sh
        tests/importing_cvs_with_multiple_vendor_imports/makerepo.sh
        tests/importing_cvs_with_multiple_vendor_imports2/makerepo.sh
        tests/importing_cvs_with_tags_after_delete/makerepo.sh

ChangeLog: 

propagate from branch 'net.venge.monotone' (head 
b1384995491837f299f6e58cfbd1c09d62fd3553)
            to branch 'net.venge.monotone.cvsimport-branch-reconstruction' 
(head db9c1600beb57a51d91a18ab7d3dab8d62f7b3d7)


monotone --db={your.database} diff 
--revision=b1384995491837f299f6e58cfbd1c09d62fd3553 
--revision=a24db2cadfa1f50bd21b41035559a74b786dbbcf
monotone --db={your.database} diff 
--revision=db9c1600beb57a51d91a18ab7d3dab8d62f7b3d7 
--revision=a24db2cadfa1f50bd21b41035559a74b786dbbcf
----------------------------------------------------------------------