[Monotone-commits-diffs] Revision ac8fd2f5ba859e6a8e11870051213356a7f6f75d

[monotone]

-----------------------------------------------------------------
Revision: ac8fd2f5ba859e6a8e11870051213356a7f6f75d
Ancestor: da932c21c2915f6ff65ff527aad0648a5c20b8f5
Ancestor: fb5d7770cc09575641ace2932dbdedc5e9ec02dd
Author: address@hidden
Date: 2008-01-04T15:00:41
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:
        visualc/unit_tests.vcproj to visualc/unit_tester.vcproj
Added files:
        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/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_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_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_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_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
Added directories:
        tests/calculation_of_unidiffs_start_of_file
        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_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_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_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_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
Modified files:
        AUTHORS NEWS cmd_othervcs.cc diff_patch.cc m4/pcre.m4
        rcs_file.cc rcs_file.hh rcs_import.cc roster.cc tester.cc
        tests/importing_cvs_branches/__driver__.lua
        tests/importing_cvs_small_real_repo/test.manifest
        tests/importing_cvs_tricky_repo_with_tags/__driver__.lua
        visualc/monotone.sln visualc/runtests.bat
        visualc/unit_tester.vcproj win32/main.cc
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_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_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 
fb5d7770cc09575641ace2932dbdedc5e9ec02dd)
            to branch 'net.venge.monotone.cvsimport-branch-reconstruction' 
(head da932c21c2915f6ff65ff527aad0648a5c20b8f5)


monotone --db={your.database} diff 
--revision=da932c21c2915f6ff65ff527aad0648a5c20b8f5 
--revision=ac8fd2f5ba859e6a8e11870051213356a7f6f75d
monotone --db={your.database} diff 
--revision=fb5d7770cc09575641ace2932dbdedc5e9ec02dd 
--revision=ac8fd2f5ba859e6a8e11870051213356a7f6f75d
----------------------------------------------------------------------