[Monotone-commits-diffs] Revision 027d01853cd3fe0f7ce2babf0c8e1e882b7d31a5

[monotone]

-----------------------------------------------------------------
Revision: 027d01853cd3fe0f7ce2babf0c8e1e882b7d31a5
Ancestor: 0ff22ac8495fb04371d386f82d11fd21dccc28ea
Ancestor: 93814bfcc9de14aff613e4dea12caf9a58a9dbc4
Author: address@hidden
Date: 2007-11-08T06:45:28
Branch: net.venge.monotone.cvsimport-branch-reconstruction

Added files:
        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_files_charset/__driver__.lua
        tests/importing_cvs_files_charset/cvs-repository/test/foo,v
        tests/importing_cvs_files_charset/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/netsync_duplicate_keys/__driver__.lua
Added directories:
        tests/importing_cvs_branches5
        tests/importing_cvs_branches5/cvs-repository
        tests/importing_cvs_branches5/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_with_conflicting_tag3
        tests/importing_cvs_with_conflicting_tag3/cvs-repository
        tests/importing_cvs_with_conflicting_tag3/cvs-repository/test
        tests/netsync_duplicate_keys
Modified files:
        netsync.cc rcs_import.cc
        tests/importing_cvs_with_conflicting_tag/__driver__.lua
        tests/importing_cvs_with_conflicting_tag2/__driver__.lua
Modified attrs:
        tests/importing_cvs_branches5/makerepo.sh
        tests/importing_cvs_files_charset/makerepo.sh
        tests/importing_cvs_with_conflicting_tag3/makerepo.sh

ChangeLog: 

merge of '0ff22ac8495fb04371d386f82d11fd21dccc28ea'
     and '93814bfcc9de14aff613e4dea12caf9a58a9dbc4'


monotone --db={your.database} diff 
--revision=0ff22ac8495fb04371d386f82d11fd21dccc28ea 
--revision=027d01853cd3fe0f7ce2babf0c8e1e882b7d31a5
monotone --db={your.database} diff 
--revision=93814bfcc9de14aff613e4dea12caf9a58a9dbc4 
--revision=027d01853cd3fe0f7ce2babf0c8e1e882b7d31a5
----------------------------------------------------------------------