[Monotone-commits-diffs] Revision cb501772f85a76aedf96fb07ccfa5026891e16b9

[monotone]

-----------------------------------------------------------------
Revision: cb501772f85a76aedf96fb07ccfa5026891e16b9
Ancestor: 4fb196b0b2d3c174352a8b6df1da0e60df8caaea
Ancestor: 5add478f10701aaffa00326cb20227046f5412fc
Author: address@hidden
Date: 2005-08-17T09:02:59
Branch: net.venge.monotone

Deleted files:
        ABOUT-NLS config.rpath m4/codeset.m4 m4/gettext.m4
        m4/glibc21.m4 m4/iconv.m4 m4/intdiv0.m4 m4/inttypes-pri.m4
        m4/inttypes.m4 m4/inttypes_h.m4 m4/isc-posix.m4
        m4/lcmessage.m4 m4/lib-ld.m4 m4/lib-link.m4 m4/lib-prefix.m4
        m4/nls.m4 m4/po.m4 m4/progtest.m4 m4/stdint_h.m4
        m4/uintmax_t.m4 m4/ulonglong.m4 mkinstalldirs
        po/Makefile.in.in
Added files:
        hash_map.hh m4/externtemplate.m4 m4/gnucxxhashmap.m4
        m4/prog_cxx_warnings.m4 m4/stlporthashmap.m4 m4/typeof.m4
        tests/t_commit_log_writeback.at
        tests/t_explicit_merge_with_anc.at tests/t_log_brief.at
Modified files:
        ChangeLog INSTALL Makefile.am botan/gzip.cpp botan/mutex.cpp
        commands.cc configure.ac constants.cc constants.hh
        database_check.cc interner.hh lua.cc merkle_tree.cc
        monotone.1 monotone.texi netsync.cc revision.cc sanity.hh
        schema_migration.cc std_hooks.lua tests/t_ambig_update.at
        tests/t_ambiguous_tags.at tests/t_annotate.at
        tests/t_annotate_add_collision.at
        tests/t_annotate_branch_collision.at
        tests/t_annotate_copy_all.at
        tests/t_annotate_lineage_dependent.at
        tests/t_annotate_split_line.at tests/t_attr.at
        tests/t_attr_drop.at tests/t_attr_init.at
        tests/t_automate_attributes.at tests/t_automate_version.at
        tests/t_checkout_options.at tests/t_commit_log_1.at
        tests/t_commit_log_2.at tests/t_commit_message_file.at
        tests/t_cvsimport2.at tests/t_database_check_minor.at
        tests/t_db_execute.at
        tests/t_db_kill_branch_certs_locally.at
        tests/t_diff_external.at tests/t_diff_first_rev.at
        tests/t_diff_restrict.at tests/t_drop_attr.at
        tests/t_dropkey_1.at tests/t_dropkey_2.at
        tests/t_existsonpath.at tests/t_heads.at
        tests/t_heads_discontinuous_branch.at tests/t_inodeprints.at
        tests/t_kill_tag_locally.at tests/t_lua_includedir.at
        tests/t_merge_lca.at tests/t_migrate_schema.at
        tests/t_multiple_heads_msg.at tests/t_netsync_exclude.at
        tests/t_netsync_pubkey.at
        tests/t_netsync_read_permissions.at
        tests/t_netsync_repeated.at tests/t_netsync_unrelated.at
        tests/t_no_change_deltas.at tests/t_normalized_filenames.at
        tests/t_override_author_date.at
        tests/t_persistent_server_keys.at
        tests/t_persistent_server_keys_2.at
        tests/t_propagate_desc.at tests/t_rcfile_dir.at
        tests/t_rcfile_stdin.at tests/t_rename_attr.at
        tests/t_sql_unpack.at tests/t_trusted.at
        tests/t_update_branch.at testsuite.at transforms.cc
        transforms.hh unix/inodeprint.cc vocab.hh win32/process.cc
        xdelta.cc

ChangeLog: 

merge of 4fb196b0b2d3c174352a8b6df1da0e60df8caaea
     and 5add478f10701aaffa00326cb20227046f5412fc


monotone --db={your.database} diff 
--revision=4fb196b0b2d3c174352a8b6df1da0e60df8caaea 
--revision=cb501772f85a76aedf96fb07ccfa5026891e16b9
monotone --db={your.database} diff 
--revision=5add478f10701aaffa00326cb20227046f5412fc 
--revision=cb501772f85a76aedf96fb07ccfa5026891e16b9
----------------------------------------------------------------------