[Monotone-commits-diffs] Revision f2ed4978d9f1601b9267f20d5d70d10a042a3788

[monotone]

-----------------------------------------------------------------
Revision: f2ed4978d9f1601b9267f20d5d70d10a042a3788
Ancestor: a99f2ecaf3cca43688476f112a23f9da0688e914
Ancestor: fa2b1a32e5c50a3f6c9ae6099c295b3028ce1743
Author: address@hidden
Date: 2005-06-23T05:24:41

Deleted files:
        tests/t_merge_binary.at
Added files:
        tests/t_lua_includedir.at tests/t_merge_manual.at
        tests/t_rcfile_dir.at tests/t_revert_restrict.at
        tests/t_status.at
Modified files:
        ChangeLog INSTALL Makefile.am app_state.cc app_state.hh
        commands.cc constants.cc constants.hh contrib/mtbrowse.sh
        database.cc diff_patch.cc diff_patch.hh file_io.cc
        file_io.hh keys.cc keys.hh lua.cc monotone.cc monotone.texi
        netcmd.cc netcmd.hh netsync.cc std_hooks.lua
        tests/t_cat_file_by_name.at tests/t_netsync_diffbranch.at
        tests/t_restrictions.at testsuite.at ui.cc vocab.cc
        vocab_terms.hh work.cc work.hh

ChangeLog: 

propagate from branch 'net.elitists.monotone.hmac' (head 
fa2b1a32e5c50a3f6c9ae6099c295b3028ce1743)
            to branch 'net.venge.monotone.netsync-0.20' (head 
a99f2ecaf3cca43688476f112a23f9da0688e914)

txtPpZBCGWcH0.txt
Description: Diff [a99f2ecaf3cca43688476f112a23f9da0688e914] -> [f2ed4978d9f1601b9267f20d5d70d10a042a3788]

txtjGc6NlymK9.txt
Description: Diff [fa2b1a32e5c50a3f6c9ae6099c295b3028ce1743] -> [f2ed4978d9f1601b9267f20d5d70d10a042a3788]