[Monotone-commits-diffs] Revision 3ca21f46d0b2d73b0a685ad4482be4267f4b5dd9

[monotone]

-----------------------------------------------------------------
Revision: 3ca21f46d0b2d73b0a685ad4482be4267f4b5dd9
Ancestor: 959ff665022c6813eb6e8c7f1daee7c9da5efd72
Ancestor: 9e65e330c0d76769296452d68d0c52335edb5f1a
Author: address@hidden
Date: 2007-02-09T18:40:59
Branch: net.venge.monotone.cvsimport-branch-reconstruction

Deleted entries:
        tests/a_tricky_cvs_repository_with_tags/test.manifest
        tests/a_tricky_cvs_repository_with_tags/test.tags
Added files:
        tests/importing_cvs_branch_from_empty_branch/__driver__.lua
        tests/importing_cvs_branches_with_correct_ancestory_2/__driver__.lua
        tests/importing_cvs_with_conflicting_tag/__driver__.lua
        tests/importing_cvs_with_conflicting_tag/e/testsrc/fileA,v
        tests/importing_cvs_with_conflicting_tag/e/testsrc/fileB,v
        tests/importing_cvs_with_missing_delta/__driver__.lua
        tests/importing_cvs_with_missing_delta/e/fileA,v
        tests/importing_cvs_with_multiple_unnamed_branches/__driver__.lua
        tests/importing_cvs_with_multiple_unnamed_branches/e/fileA,v
        tests/importing_cvs_with_multiple_vendor_imports/__driver__.lua
        tests/importing_cvs_with_tags_after_delete/__driver__.lua
        tests/importing_cvs_with_unnamed_branch/__driver__.lua
        tests/importing_cvs_with_unnamed_branch/e/fileA,v
Added directories:
        tests/importing_cvs_branch_from_empty_branch
        tests/importing_cvs_branches_with_correct_ancestory_2
        tests/importing_cvs_with_conflicting_tag
        tests/importing_cvs_with_conflicting_tag/e
        tests/importing_cvs_with_conflicting_tag/e/testsrc
        tests/importing_cvs_with_missing_delta
        tests/importing_cvs_with_missing_delta/e
        tests/importing_cvs_with_multiple_unnamed_branches
        tests/importing_cvs_with_multiple_unnamed_branches/e
        tests/importing_cvs_with_multiple_vendor_imports
        tests/importing_cvs_with_tags_after_delete
        tests/importing_cvs_with_unnamed_branch
        tests/importing_cvs_with_unnamed_branch/e
Modified files:
        AUTHORS ChangeLog cmd_merging.cc diff_patch.cc diff_patch.hh
        netio.hh po/it.po rcs_import.cc
        tests/a_tricky_cvs_repository_with_tags/__driver__.lua
        tests/importing_cvs_branches_with_correct_ancestory/__driver__.lua
        tests/test_a_merge_8/correct tests/test_a_merge_8/left
        tests/test_a_merge_8/parent tests/test_a_merge_8/right
        testsuite.lua work.cc

ChangeLog: 

propagate from branch 'net.venge.monotone' (head 
9e65e330c0d76769296452d68d0c52335edb5f1a)
            to branch 'net.venge.monotone.cvsimport-branch-reconstruction' 
(head 959ff665022c6813eb6e8c7f1daee7c9da5efd72)


monotone --db={your.database} diff 
--revision=959ff665022c6813eb6e8c7f1daee7c9da5efd72 
--revision=3ca21f46d0b2d73b0a685ad4482be4267f4b5dd9
monotone --db={your.database} diff 
--revision=9e65e330c0d76769296452d68d0c52335edb5f1a 
--revision=3ca21f46d0b2d73b0a685ad4482be4267f4b5dd9
----------------------------------------------------------------------