[Monotone-commits-diffs] Revision 2324f7ed7d3eb9bfbc63eaea28a83e7ed3914928

[monotone]

-----------------------------------------------------------------
Revision: 2324f7ed7d3eb9bfbc63eaea28a83e7ed3914928
Ancestor: 7650c1367f9695c7ae8405f841b14bd23f9e8675
Ancestor: 9f34e8399dadca7997ad3c952a27339f4e451daa
Author: address@hidden
Date: 2008-02-22T12:49:58
Branch: net.venge.monotone.cvsimport-branch-reconstruction

Deleted entries:
        tests/automate_get_revision/expected2
Added files:
        tests/automate_get_current_revision/__driver__.lua
Added directories:
        tests/automate_get_current_revision
Modified files:
        NEWS automate.cc cmd_netsync.cc cmd_ws_commit.cc merge.cc
        monotone.texi rcs_import.cc
        tests/automate_get_current_revision_id/__driver__.lua
        tests/automate_get_revision/__driver__.lua
        tests/automate_inventory_options/__driver__.lua
        tests/automate_inventory_options/expected-no-ignored.stdout
        tests/automate_inventory_options/expected-no-unchanged.stdout
        tests/automate_inventory_options/expected-no-unknown.stdout
        tests/automate_inventory_options/expected-none.stdout
        tests/automate_inventory_options/expected-renames-both.stdout
        tests/automate_inventory_options/expected-renames-source.stdout
        
tests/automate_inventory_options/expected-renames-target-no-ignored.stdout
        
tests/automate_inventory_options/expected-renames-target-no-unknown.stdout
        tests/automate_inventory_options/expected-renames-target.stdout
        tests/merge_into_workspace_files_added/__driver__.lua
        tests/normalized_filenames/__driver__.lua
        tests/pluck_lifecycle/__driver__.lua
        tests/workspace_migration/__driver__.lua
        tests/ws_ops_with_wrong_node_type/__driver__.lua
        unix/terminal.cc

ChangeLog: 

merge of '7650c1367f9695c7ae8405f841b14bd23f9e8675'
     and '9f34e8399dadca7997ad3c952a27339f4e451daa'


monotone --db={your.database} diff 
--revision=7650c1367f9695c7ae8405f841b14bd23f9e8675 
--revision=2324f7ed7d3eb9bfbc63eaea28a83e7ed3914928
monotone --db={your.database} diff 
--revision=9f34e8399dadca7997ad3c952a27339f4e451daa 
--revision=2324f7ed7d3eb9bfbc63eaea28a83e7ed3914928
----------------------------------------------------------------------