[Monotone-commits-diffs] Revision 5275a016cc4cda8e1b4be2693ccfffd39ffbd1c3

[monotone]

-----------------------------------------------------------------
Revision: 5275a016cc4cda8e1b4be2693ccfffd39ffbd1c3
Ancestor: 2913f951a9b32aad037cecbacf0967fb15f0c858
Ancestor: 90e6cdbef4f5190c0d6ec4337be80b5e5dda84b6
Author: address@hidden
Date: 2009-04-15T00:40:00
Branch: net.venge.monotone.experiment.intrusive-ptr

Added files:
        intrusive_ptr.hh
Modified files:
        cmd_conflicts.cc cmd_merging.cc database.cc database.hh
        merge_conflict.cc merge_content.cc merge_content.hh
        merge_roster.hh migrate_ancestry.cc pcrewrap.hh
        restrictions.hh rev_types.hh revision.hh roster.hh
        unit-tests/xdelta.cc vocab.cc vocab.hh work.cc work.hh
        xdelta.cc xdelta.hh

ChangeLog: 

propagate from branch 'net.venge.monotone' (head 
2913f951a9b32aad037cecbacf0967fb15f0c858)
            to branch 'net.venge.monotone.experiment.intrusive-ptr' (head 
90e6cdbef4f5190c0d6ec4337be80b5e5dda84b6)


monotone --db={your.database} diff 
--revision=2913f951a9b32aad037cecbacf0967fb15f0c858 
--revision=5275a016cc4cda8e1b4be2693ccfffd39ffbd1c3
monotone --db={your.database} diff 
--revision=90e6cdbef4f5190c0d6ec4337be80b5e5dda84b6 
--revision=5275a016cc4cda8e1b4be2693ccfffd39ffbd1c3
----------------------------------------------------------------------