[Monotone-commits-diffs] Revision 066d915b7ea398f5b16659c4bcef976b344dcc65

[monotone]

-----------------------------------------------------------------
Revision: 066d915b7ea398f5b16659c4bcef976b344dcc65
Ancestor: b2a2fb1b0c890dea7744a2371baed10d28cba3d7
Ancestor: d4e096f96c969ce408754d2192de0cd2a7edfb3e
Author: address@hidden
Date: 2006-03-03T05:40:40
Branch: net.venge.monotone

Added files:
        tests/t_merge_into_dir.at
        tests/t_restriction_excludes_parent.at
        tests/t_show_conflicts.at
Modified files:
        ChangeLog app_state.cc app_state.hh commands.cc
        contrib/ciabot_monotone.py database.cc merge.cc merge.hh
        monotone.cc monotone.texi netsync.cc paths.cc po/fr.po
        po/sv.po restrictions.cc restrictions.hh revision.cc
        roster.cc schema_migration.cc tests/t_add.at
        tests/t_mt_ignore.at tests/t_persistent_server_keys_2.at
        tests/t_restriction_with_exclude.at tests/t_restrictions.at
        tests/t_revert_new_project.at tests/t_subdirs.at
        testsuite.at transforms.cc transforms.hh work.cc work.hh

ChangeLog: 

merge of b2a2fb1b0c890dea7744a2371baed10d28cba3d7
     and d4e096f96c969ce408754d2192de0cd2a7edfb3e


monotone --db={your.database} diff 
--revision=b2a2fb1b0c890dea7744a2371baed10d28cba3d7 
--revision=066d915b7ea398f5b16659c4bcef976b344dcc65
monotone --db={your.database} diff 
--revision=d4e096f96c969ce408754d2192de0cd2a7edfb3e 
--revision=066d915b7ea398f5b16659c4bcef976b344dcc65
----------------------------------------------------------------------