[Monotone-commits-diffs] Revision f36fd6641e5ff2027eb12ebdc1130a43b8c44eb6

[monotone]

-----------------------------------------------------------------
Revision: f36fd6641e5ff2027eb12ebdc1130a43b8c44eb6
Ancestor: 22f57ca13a58e701731db82c612f33aa5602262d
Ancestor: 7f3ac6a5a06e2db4656ebbbb8ab72eea582409b9
Author: Timothy Brownawell  <address@hidden>
Date: 2006-04-02T08:39:51
Branch: net.venge.monotone.visualc8

Deleted entries:
        sqlite/config.h sqlite/os_unix.h sqlite/os_win.h
Renamed entries:
        tests/t_sql_unpack.at to tests/t_sql_gunzip.at
Added files:
        boost/format/feed_args.hpp boost/format.hpp lru_cache.h
        po/it.po sqlite/os.c tests/t_commit_validate.at
        tests/t_cvsimport_branch.at tests/t_db_kill_rev_locally_2.at
        tests/t_disapprove_branch.at tests/t_log_dir.at
        tests/t_log_nofiles_nomerges.at tests/t_log_selectors.at
        tests/t_log_to_file.at tests/t_ls_changed.at
        tests/t_merge_into_dir.at tests/t_netsync_notes.at
        tests/t_pivot_root.at tests/t_pivot_root_revert.at
        tests/t_pivot_root_update.at
        tests/t_restriction_excludes_parent.at
        tests/t_revert_move_to_renamed_dir.at
        tests/t_revert_new_project.at
        tests/t_rosterify_root_suture.at
        tests/t_serve_ignores_mt_options.at
        tests/t_show_conflicts.at tests/t_sink_has_extra_epochs.at
        visualc/config.h visualc/cryptopp.vcproj visualc/lua.vcproj
        visualc/monotone.vcproj visualc/mt-stdint.h
        visualc/netxx.vcproj visualc/popt.vcproj
        visualc/sqlite3.vcproj visualc/stdint.h
        visualc/stringprep.vcproj visualc/txt2c.vcproj
        visualc/unistd.h visualc/unknown_package.txt
Added directories:
        boost/format visualc
Modified files:
        AUTHORS COPYING ChangeLog Makefile.am NEWS ROADMAP
        annotate.cc app_state.cc app_state.hh automate.cc
        automate.hh basic_io.cc basic_io.hh botan/config.h
        botan/gzip.h cert.hh commands.cc commands.hh configure.ac
        constants.cc constants.hh contrib/ciabot_monotone.py
        contrib/color-logs.conf contrib/color-logs.sh
        contrib/monotone-notify.pl contrib/monotone.bash_completion
        contrib/monotone.el contrib/usher.cc cset.cc cset.hh
        database.cc database.hh debian/changelog diff_patch.cc
        diff_patch.hh enumerator.cc enumerator.hh file_io.cc
        file_io.hh hash_map.hh hmac.cc idna/idna.c interner.hh
        key_store.cc key_store.hh keys.cc keys.hh lua.cc lua.hh
        m4/prog_cxx_warnings.m4 merge.cc merge.hh mkstemp.cc
        monotone.1 monotone.cc monotone.spec monotone.texi
        mt_version.cc netcmd.cc netcmd.hh netio.hh netsync.cc
        netxx/peer.cxx netxx/probe_select.cxx netxx/sockaddr.cxx
        netxx/sockaddr.h options.hh paths.cc paths.hh pch.hh
        po/LINGUAS po/fr.po po/sv.po popt/poptint.h popt/system.h
        rcs_import.cc refiner.cc restrictions.cc restrictions.hh
        revision.cc revision.hh roster.cc roster.hh roster_merge.cc
        roster_merge.hh sanity.cc sanity.hh schema.sql
        schema_migration.cc schema_migration.hh sqlite/alter.c
        sqlite/analyze.c sqlite/attach.c sqlite/auth.c
        sqlite/btree.c sqlite/btree.h sqlite/build.c
        sqlite/callback.c sqlite/complete.c sqlite/date.c
        sqlite/delete.c sqlite/expr.c sqlite/func.c sqlite/hash.c
        sqlite/insert.c sqlite/keywordhash.h sqlite/legacy.c
        sqlite/main.c sqlite/opcodes.c sqlite/opcodes.h sqlite/os.h
        sqlite/os_common.h sqlite/os_unix.c sqlite/os_win.c
        sqlite/pager.c sqlite/pager.h sqlite/parse.c sqlite/parse.h
        sqlite/pragma.c sqlite/prepare.c sqlite/printf.c
        sqlite/random.c sqlite/select.c sqlite/sqlite3.h
        sqlite/sqliteInt.h sqlite/table.c sqlite/tokenize.c
        sqlite/trigger.c sqlite/update.c sqlite/utf.c sqlite/util.c
        sqlite/vacuum.c sqlite/vdbe.c sqlite/vdbe.h sqlite/vdbeInt.h
        sqlite/vdbeapi.c sqlite/vdbeaux.c sqlite/vdbemem.c
        sqlite/where.c std_hooks.lua test_hooks.lua tests/t_add.at
        tests/t_add_intermediate_MT_path.at tests/t_add_owndb.at
        tests/t_bad_packets.at tests/t_cvsimport.at
        tests/t_cvsimport3.at tests/t_cvsimport_deleted_invar.at
        tests/t_cvsimport_manifest_cycle.at
        tests/t_cvsimport_samelog.at tests/t_database_check.at
        tests/t_database_check_normalized.at tests/t_delete_dir.at
        tests/t_delete_dir_patch.at
        tests/t_diff_outside_workspace.at tests/t_drop_missing.at
        tests/t_dump_load.at tests/t_empty_env.at tests/t_epoch.at
        tests/t_migrate_schema.at tests/t_mt_ignore.at
        tests/t_netsync_permissions.at
        tests/t_persistent_server_keys_2.at tests/t_rename.at
        tests/t_restriction_with_exclude.at tests/t_restrictions.at
        tests/t_rosterify_attrs.at tests/t_rosterify_rename.at
        tests/t_singlecvs.at tests/t_sql_gunzip.at
        tests/t_subdir_drop.at tests/t_subdirs.at
        tests/t_update_off_branch.at testsuite.at transforms.cc
        transforms.hh ui.cc ui.hh unit_tests.cc unit_tests.hh
        vocab.cc vocab.hh win32/fs.cc win32/inodeprint.cc
        win32/monotone.iss work.cc work.hh xdelta.cc

ChangeLog: 

explicit_merge of '22f57ca13a58e701731db82c612f33aa5602262d'
              and '7f3ac6a5a06e2db4656ebbbb8ab72eea582409b9'
        to branch 'net.venge.monotone.visualc8'


monotone --db={your.database} diff 
--revision=22f57ca13a58e701731db82c612f33aa5602262d 
--revision=f36fd6641e5ff2027eb12ebdc1130a43b8c44eb6
monotone --db={your.database} diff 
--revision=7f3ac6a5a06e2db4656ebbbb8ab72eea582409b9 
--revision=f36fd6641e5ff2027eb12ebdc1130a43b8c44eb6
----------------------------------------------------------------------