[Monotone-commits-diffs] Revision c572a648952fce5fe0f2c759f033bf56427f6025

[monotone]

-----------------------------------------------------------------
Revision: c572a648952fce5fe0f2c759f033bf56427f6025
Ancestor: d7fe15cca8511fd68ca7b826153c491d1c8e9e55
Ancestor: f991912d2b96abc3107255bb74ddf0067e596843
Author: Timothy Brownawell  <address@hidden>
Date: 2009-04-29T01:01:47
Branch: net.venge.monotone.keys-by-hash

Modified files:
        automate.cc cmd_db.cc cmd_netsync.cc database.cc database.hh
        key_store.cc key_store.hh keys.cc keys.hh merge_conflict.cc
        merge_content.cc migrate_ancestry.cc migrate_schema.cc
        monotone.cc netsync.cc project.cc sanity.cc sanity.hh
        schema.sql
        tests/quiet_turns_off_tickers_but_not_warnings/__driver__.lua
        tests/spawn_redirected_hook_helper/__driver__.lua
        tests/spawn_redirected_hook_helper/testhooks txt2c.cc ui.cc
        ui.hh unit-tests/netcmd.cc unit-tests/packet.cc
        unit-tests/roster.cc unit_tester.cc vocab.cc vocab.hh

ChangeLog: 

merge of 'd7fe15cca8511fd68ca7b826153c491d1c8e9e55'
     and 'f991912d2b96abc3107255bb74ddf0067e596843'


monotone --db={your.database} diff 
--revision=d7fe15cca8511fd68ca7b826153c491d1c8e9e55 
--revision=c572a648952fce5fe0f2c759f033bf56427f6025
monotone --db={your.database} diff 
--revision=f991912d2b96abc3107255bb74ddf0067e596843 
--revision=c572a648952fce5fe0f2c759f033bf56427f6025
----------------------------------------------------------------------