[Monotone-commits-diffs] Revision 88091d4fd673e0fd1ba57558097058c070b7cd31

[monotone]

-----------------------------------------------------------------
Revision: 88091d4fd673e0fd1ba57558097058c070b7cd31
Ancestor: 5275a016cc4cda8e1b4be2693ccfffd39ffbd1c3
Ancestor: 7ac4fa1ee120a3a46bfa10fb791fdd75f015ea35
Author: address@hidden
Date: 2009-04-18T22:47:07
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 monotone.cc pcrewrap.hh
        restrictions.hh rev_types.hh revision.hh roster.hh sanity.cc
        sanity.hh ui.cc ui.hh unit-tests/xdelta.cc work.cc work.hh
        xdelta.cc xdelta.hh

ChangeLog: 

propagate from branch 'net.venge.monotone' (head 
7ac4fa1ee120a3a46bfa10fb791fdd75f015ea35)
            to branch 'net.venge.monotone.experiment.intrusive-ptr' (head 
5275a016cc4cda8e1b4be2693ccfffd39ffbd1c3)


monotone --db={your.database} diff 
--revision=5275a016cc4cda8e1b4be2693ccfffd39ffbd1c3 
--revision=88091d4fd673e0fd1ba57558097058c070b7cd31
monotone --db={your.database} diff 
--revision=7ac4fa1ee120a3a46bfa10fb791fdd75f015ea35 
--revision=88091d4fd673e0fd1ba57558097058c070b7cd31
----------------------------------------------------------------------