[Monotone-commits-diffs] Revision b2e0dc68fe44a0b42cc91f3d7c2d63868fbd0105

[monotone]

-----------------------------------------------------------------
Revision: b2e0dc68fe44a0b42cc91f3d7c2d63868fbd0105
Ancestor: 69cbda8f17f589507d3a0cf449b581519b2bf8f8
Ancestor: c4f2cc2114d4935efa1e68282934a1452b984318
Author: address@hidden
Date: 2007-02-08T00:39:55
Branch: net.venge.monotone.experiment.summit07.lapo-gab

Renamed entries:
        tests/drop_directory_with_unversioned_files_and_merge to 
tests/drop_directory_with_unversioned_files_and_update
Added files:
        tests/db_kill_rev_and_recommit/__driver__.lua
        tests/magic__MTN_in_restrictions/__driver__.lua
Added directories:
        tests/db_kill_rev_and_recommit
        tests/magic__MTN_in_restrictions
Modified files:
        ChangeLog NEWS asciik.cc charset.cc cmd.hh file_io.cc
        paths.cc paths.hh po/sv.po
        tests/(imp)_deleting_directories/__driver__.lua
        tests/_MTN_case-folding_security_patch/__driver__.lua
        tests/add_inside__MTN_/__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/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/test_a_merge_8/__driver__.lua
        tests/update_clobbers_workspace/__driver__.lua
        tests/update_does_not_stomp_non-monotone_files/__driver__.lua
        testsuite.lua work.cc

ChangeLog: 

merge of '69cbda8f17f589507d3a0cf449b581519b2bf8f8'
     and 'c4f2cc2114d4935efa1e68282934a1452b984318'


monotone --db={your.database} diff 
--revision=69cbda8f17f589507d3a0cf449b581519b2bf8f8 
--revision=b2e0dc68fe44a0b42cc91f3d7c2d63868fbd0105
monotone --db={your.database} diff 
--revision=c4f2cc2114d4935efa1e68282934a1452b984318 
--revision=b2e0dc68fe44a0b42cc91f3d7c2d63868fbd0105
----------------------------------------------------------------------