[Monotone-commits-diffs] Revision 770dd4f5131626cb1597706f9f253fbd201ae569

[monotone]

-----------------------------------------------------------------
Revision: 770dd4f5131626cb1597706f9f253fbd201ae569
Ancestor: 066d915b7ea398f5b16659c4bcef976b344dcc65
Ancestor: c17afe5ac724f7e4137417c89ae47badb7d11e02
Author: address@hidden
Date: 2006-03-03T05:43:01
Branch: net.venge.monotone.experiment.rosters.restrictions

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 automate.cc commands.cc
        contrib/ciabot_monotone.py database.cc database.hh
        globish.cc globish.hh merge.cc merge.hh monotone.cc
        monotone.texi netsync.cc paths.cc po/fr.po po/sv.po
        restrictions.cc restrictions.hh revision.cc revision.hh
        roster.cc roster.hh schema_migration.cc tests/t_add.at
        tests/t_automate_get_manifest_of.at tests/t_mt_ignore.at
        tests/t_persistent_server_keys_2.at
        tests/t_restricted_diff_unchanged.at
        tests/t_restriction_with_exclude.at tests/t_restrictions.at
        tests/t_revert_new_project.at tests/t_status.at
        tests/t_subdirs.at testsuite.at transforms.cc transforms.hh
        unit_tests.cc unit_tests.hh work.cc work.hh

ChangeLog: 

propagate from branch 'net.venge.monotone' (head 
066d915b7ea398f5b16659c4bcef976b344dcc65)
            to branch 'net.venge.monotone.experiment.rosters.restrictions' 
(head c17afe5ac724f7e4137417c89ae47badb7d11e02)


monotone --db={your.database} diff 
--revision=066d915b7ea398f5b16659c4bcef976b344dcc65 
--revision=770dd4f5131626cb1597706f9f253fbd201ae569
monotone --db={your.database} diff 
--revision=c17afe5ac724f7e4137417c89ae47badb7d11e02 
--revision=770dd4f5131626cb1597706f9f253fbd201ae569
----------------------------------------------------------------------