[Monotone-commits-nodiffs] Revision 6231d3db4b41045b5ff02508cba3dc4ca298aa29

[monotone]

-----------------------------------------------------------------
Revision: 6231d3db4b41045b5ff02508cba3dc4ca298aa29
Ancestor: 002659a975c9fbe1bbbd79e70f6db9a294cb759f
Ancestor: 388907d0e5d2f179f452d9281b09f616e0306b1f
Author: Matt Johnston <address@hidden>
Date: 2005-11-25T03:45:02
Branch: net.venge.monotone.experiment.rosters

Added files:
        tests/t_automate_get_manifest.at
Modified files:
        automate.cc merge.cc roster_merge.cc testsuite.at

ChangeLog: 

merge of 002659a975c9fbe1bbbd79e70f6db9a294cb759f
     and 388907d0e5d2f179f452d9281b09f616e0306b1f


monotone --db={your.database} diff 
--revision=002659a975c9fbe1bbbd79e70f6db9a294cb759f 
--revision=6231d3db4b41045b5ff02508cba3dc4ca298aa29
monotone --db={your.database} diff 
--revision=388907d0e5d2f179f452d9281b09f616e0306b1f 
--revision=6231d3db4b41045b5ff02508cba3dc4ca298aa29
----------------------------------------------------------------------