[Monotone-commits-diffs] Revision a986c9358ff7118c336806993c86ad1ace4ae6d4

[monotone]

-----------------------------------------------------------------
Revision: a986c9358ff7118c336806993c86ad1ace4ae6d4
Ancestor: 1e4a072006c6ca12a71a4432944699060cef9a4f
Ancestor: 9ec4cf0312626256994a3d7e9486b150c7e5db9c
Author: address@hidden
Date: 2006-03-04T05:52:16
Branch: net.venge.monotone

Added files:
        tests/t_restriction_excludes_parent.at
Modified files:
        ChangeLog app_state.cc app_state.hh automate.cc commands.cc
        netsync.cc po/fr.po po/sv.po restrictions.cc restrictions.hh
        std_hooks.lua tests/t_add.at tests/t_bad_packets.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 work.cc work.hh

ChangeLog: 

merge of 1e4a072006c6ca12a71a4432944699060cef9a4f
     and 9ec4cf0312626256994a3d7e9486b150c7e5db9c


monotone --db={your.database} diff 
--revision=1e4a072006c6ca12a71a4432944699060cef9a4f 
--revision=a986c9358ff7118c336806993c86ad1ace4ae6d4
monotone --db={your.database} diff 
--revision=9ec4cf0312626256994a3d7e9486b150c7e5db9c 
--revision=a986c9358ff7118c336806993c86ad1ace4ae6d4
----------------------------------------------------------------------