[Monotone-commits-diffs] Revision 301fe8a4e32541a8db76e071ae0a6a8bc5482ae5

[monotone]

-----------------------------------------------------------------
Revision: 301fe8a4e32541a8db76e071ae0a6a8bc5482ae5
Ancestor: d0746de2219572bdaf3b0329f021052870290221
Ancestor: ef39de24eccef9b22490d48964acbfadedfc133f
Author: address@hidden
Date: 2007-09-09T18:46:08
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
Added files:
        contrib/diff3_keep_conflicts_merger.lua
        tests/db_kill_rev_locally_workspace/__driver__.lua
Added directories:
        tests/db_kill_rev_locally_workspace
Modified files:
        NEWS cmd_db.cc cmd_merging.cc cmd_netsync.cc database.cc
        monotone.texi project.cc project.hh std_hooks.lua tester.cc
        tests/checkout_validates_target_directory/__driver__.lua
        tests/clone_validates_target_directory/__driver__.lua
        tests/db_kill_rev_locally/__driver__.lua
        tests/db_kill_rev_locally_and_recommit/__driver__.lua
        tests/spawn_redirected_hook_helper/__driver__.lua work.cc
        work.hh

ChangeLog: 

merge of 'd0746de2219572bdaf3b0329f021052870290221'
     and 'ef39de24eccef9b22490d48964acbfadedfc133f'


monotone --db={your.database} diff 
--revision=d0746de2219572bdaf3b0329f021052870290221 
--revision=301fe8a4e32541a8db76e071ae0a6a8bc5482ae5
monotone --db={your.database} diff 
--revision=ef39de24eccef9b22490d48964acbfadedfc133f 
--revision=301fe8a4e32541a8db76e071ae0a6a8bc5482ae5
----------------------------------------------------------------------