[Monotone-commits-diffs] Revision 15a9076216de2b216d161ca333ecc35d7decf720

[monotone]

-----------------------------------------------------------------
Revision: 15a9076216de2b216d161ca333ecc35d7decf720
Ancestor: 7c027102b56caf9a0c0f8426932e2d57019b7db4
Ancestor: ef700763822d9516dab01bf6006bbd2e1682607c
Author: address@hidden
Date: 2007-09-08T20:49:50
Branch: net.venge.monotone

Deleted entries:
        tests/db_kill_rev_locally_command_2
        tests/db_kill_rev_locally_command_2/__driver__.lua
Renamed entries:
        tests/db_kill_rev_and_recommit to tests/db_kill_rev_locally_and_recommit
        tests/db_kill_rev_locally_command to tests/db_kill_rev_locally
Modified files:
        cmd_db.cc cmd_diff_log.cc cmd_merging.cc cmd_ws_commit.cc
        tests/db_kill_rev_locally/__driver__.lua work.cc work.hh

ChangeLog: 

merge of '7c027102b56caf9a0c0f8426932e2d57019b7db4'
     and 'ef700763822d9516dab01bf6006bbd2e1682607c'


monotone --db={your.database} diff 
--revision=7c027102b56caf9a0c0f8426932e2d57019b7db4 
--revision=15a9076216de2b216d161ca333ecc35d7decf720
monotone --db={your.database} diff 
--revision=ef700763822d9516dab01bf6006bbd2e1682607c 
--revision=15a9076216de2b216d161ca333ecc35d7decf720
----------------------------------------------------------------------