[Monotone-commits-diffs] Revision 3326d52bea1e82f85fc39c57f4b0797c27a13337

[monotone]

-----------------------------------------------------------------
Revision: 3326d52bea1e82f85fc39c57f4b0797c27a13337
Ancestor: 3a65d2492cf52d188685daa620582015ef6c0aec
Ancestor: 606f9f0292eeb750b0f34950dbcf3e042ae276b8
Author: address@hidden
Date: 2007-02-11T02:28:31
Branch: net.venge.monotone

Modified files:
        cmd.hh cmd_merging.cc cmd_ws_commit.cc commands.cc
        monotone.texi po/de.po tester.cc
        tests/(imp)_deleting_directories/__driver__.lua
        tests/(imp)_merge((patch_foo_a),_(delete_foo_))/__driver__.lua
        tests/a_tricky_cvs_repository_with_tags/__driver__.lua
        tests/attr_command_in_subdirs/__driver__.lua
        tests/attr_set_get_commands/__driver__.lua
        tests/checkout_creates__MTN_log/__driver__.lua
        tests/checkout_does_not_clobber_workspace/__driver__.lua
        tests/delete_work_file_on_checkout/__driver__.lua
        tests/diff_shows_renames/__driver__.lua
        tests/importing_a_small,_real_cvs_repository/__driver__.lua
        tests/merge((patch_foo_a),_(rename_foo__bar_))/__driver__.lua
        
tests/merge_a_project_into_a_subdirectory_of_an_unrelated_project/__driver__.lua
        tests/merging_(add_a)_with_(add_a,_drop_a)/__driver__.lua
        tests/merging_an_add_edge/__driver__.lua
        tests/multiple_version_committing/__driver__.lua
        tests/persistent_netsync_server_-_revs_&_certs/__driver__.lua
        tests/rename_dir_to_non-sibling/__driver__.lua
        tests/selecting_arbitrary_certs/__driver__.lua
        tests/test_annotate_command/__driver__.lua
        tests/update_updates_inodeprints/__driver__.lua
        testsuite.lua work.cc work.hh

ChangeLog: 

merge of '3a65d2492cf52d188685daa620582015ef6c0aec'
     and '606f9f0292eeb750b0f34950dbcf3e042ae276b8'


monotone --db={your.database} diff 
--revision=3a65d2492cf52d188685daa620582015ef6c0aec 
--revision=3326d52bea1e82f85fc39c57f4b0797c27a13337
monotone --db={your.database} diff 
--revision=606f9f0292eeb750b0f34950dbcf3e042ae276b8 
--revision=3326d52bea1e82f85fc39c57f4b0797c27a13337
----------------------------------------------------------------------