[Monotone-commits-diffs] Revision 4702a064691498a82806428d065610ccab37fccf

[monotone]

-----------------------------------------------------------------
Revision: 4702a064691498a82806428d065610ccab37fccf
Ancestor: 5d99ca5b379a385d40db09a50e2496538694b633
Ancestor: 842ea277731d1c1265cdd64e9316391053c8aa2d
Author: address@hidden
Date: 2007-11-07T21:49:19
Branch: net.venge.monotone.cvsimport-branch-reconstruction

Deleted entries:
        debian/monotone.install
Renamed entries:
        debian/monotone.info to debian/monotone-doc.info
Added files:
        debian/monotone-doc.dirs
        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
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
Modified files:
        debian/changelog debian/control debian/monotone-doc.docs
        debian/monotone-doc.info debian/monotone-server.config
        debian/monotone-server.monotone.init
        debian/monotone-server.postinst debian/monotone.docs
        debian/rules
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 '5d99ca5b379a385d40db09a50e2496538694b633'
     and '842ea277731d1c1265cdd64e9316391053c8aa2d'


monotone --db={your.database} diff 
--revision=5d99ca5b379a385d40db09a50e2496538694b633 
--revision=4702a064691498a82806428d065610ccab37fccf
monotone --db={your.database} diff 
--revision=842ea277731d1c1265cdd64e9316391053c8aa2d 
--revision=4702a064691498a82806428d065610ccab37fccf
----------------------------------------------------------------------