[Monotone-commits-diffs] Revision 5506362b4466a3d1d8f71c5a02976989603c50af

[monotone]

-----------------------------------------------------------------
Revision: 5506362b4466a3d1d8f71c5a02976989603c50af
Ancestor: 0206ca3b713fe2b78304a76be7e37c422e1b1378
Ancestor: 950f63ff92b50f1fd54a3dc526c5ba4a913c5f40
Author: address@hidden
Date: 2007-02-07T19:36:09
Branch: net.venge.monotone

Renamed entries:
        tests/drop_directory_with_unversioned_files_and_merge to 
tests/drop_directory_with_unversioned_files_and_update
Added files:
        tests/test_a_merge_8/__driver__.lua
        tests/test_a_merge_8/correct tests/test_a_merge_8/left
        tests/test_a_merge_8/parent tests/test_a_merge_8/right
Added directories:
        tests/test_a_merge_8
Modified files:
        ChangeLog NEWS cmd_diff_log.cc file_io.cc file_io.hh
        po/de.po po/it.po po/sv.po
        tests/(imp)_deleting_directories/__driver__.lua
        tests/addition_of_files_and_directories/__driver__.lua
        tests/annotate_file_whose_name_changed/__driver__.lua
        tests/drop_directory_with_unversioned_files_and_update/__driver__.lua
        tests/ls_unknown_in_subdir/__driver__.lua
        tests/ls_unknown_of_unknown_subdir/__driver__.lua
        tests/merge((),_(add_a,_drop_a,_add_a))/__driver__.lua
        tests/merge((),_(add_a,_patch_a,_drop_a,_add_a))/__driver__.lua
        tests/merging_a_rename_twice/__driver__.lua
        tests/merging_adds/__driver__.lua
        tests/renaming_a_deleted_file/__driver__.lua
        tests/repeatedly_exchanging_work_via_netsync/__driver__.lua
        tests/schema_migration/__driver__.lua
        tests/schema_migration_with_rosterify/__driver__.lua
        tests/test_a_merge_7/__driver__.lua
        tests/things_in_.mtn-ignore_get_ignored/__driver__.lua
        tests/update_clobbers_workspace/__driver__.lua
        tests/update_does_not_stomp_non-monotone_files/__driver__.lua
        testsuite.lua win32/os_strerror.cc work.cc

ChangeLog: 

merge of '0206ca3b713fe2b78304a76be7e37c422e1b1378'
     and '950f63ff92b50f1fd54a3dc526c5ba4a913c5f40'


monotone --db={your.database} diff 
--revision=0206ca3b713fe2b78304a76be7e37c422e1b1378 
--revision=5506362b4466a3d1d8f71c5a02976989603c50af
monotone --db={your.database} diff 
--revision=950f63ff92b50f1fd54a3dc526c5ba4a913c5f40 
--revision=5506362b4466a3d1d8f71c5a02976989603c50af
----------------------------------------------------------------------