[Monotone-commits-diffs] Revision c618a9244fa7b8b80a97e3b7d72e5cac7a394b28

[monotone]

-----------------------------------------------------------------
Revision: c618a9244fa7b8b80a97e3b7d72e5cac7a394b28
Ancestor: 6a2036cae0ca461c169ae66696a84951a9233783
Ancestor: b016c6563c651f9199c921a8ab6a7b2c3133bb86
Author: address@hidden
Date: 2006-12-01T08:46:12
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/import/__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_multiple_vendor_imports/__driver__.lua
Added directories:
        tests/import
        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_multiple_vendor_imports
Modified files:
        AUTHORS ChangeLog cmd_ws_commit.cc monotone.texi
        options_list.hh po/de.po po/sv.po rcs_import.cc
        tests/a_tricky_cvs_repository_with_tags/__driver__.lua
        tests/importing_cvs_branches_with_correct_ancestory/__driver__.lua
        testsuite.lua

ChangeLog: 

propagate from branch 'net.venge.monotone' (head 
6a2036cae0ca461c169ae66696a84951a9233783)
            to branch 'net.venge.monotone.cvsimport-branch-reconstruction' 
(head b016c6563c651f9199c921a8ab6a7b2c3133bb86)


monotone --db={your.database} diff 
--revision=6a2036cae0ca461c169ae66696a84951a9233783 
--revision=c618a9244fa7b8b80a97e3b7d72e5cac7a394b28
monotone --db={your.database} diff 
--revision=b016c6563c651f9199c921a8ab6a7b2c3133bb86 
--revision=c618a9244fa7b8b80a97e3b7d72e5cac7a394b28
----------------------------------------------------------------------