[Monotone-commits-diffs] Revision 4310b41fbacb43fb081ee1a31a928afddf96d679

[monotone]

-----------------------------------------------------------------
Revision: 4310b41fbacb43fb081ee1a31a928afddf96d679
Ancestor: 760fbde546281672dd6fa5e00846b36a51ccda13
Ancestor: 79c056f9e7734307b9bc4b60c0505ed9ad6f88bf
Author: address@hidden
Date: 2005-04-27T12:35:02
Branch: net.venge.monotone.sqlite3

Deleted files:
        debian/compat debian/files debian/monotone.1
        sqlite/keywordhash.c sqlite/os_mac.c sqlite/os_mac.h
        sqlite/os_test.c sqlite/os_test.h
Added files:
        .mt-attrs UPGRADE automate.cc automate.hh
        contrib/Log2Gxl.java contrib/README
        contrib/ciabot_monotone.py contrib/monotone-import.pl
        contrib/monotone-notify.pl contrib/monotone.bash_completion
        contrib/monotone.el database_check.cc database_check.hh
        doxygen.cfg epoch.cc epoch.hh gettext.h idna/idn-int.h
        inodeprint.cc inodeprint.hh lua/modemuncher.c
        package_full_revision.h package_revision.h path_component.cc
        path_component.hh popt/CHANGES popt/COPYING popt/README
        popt/findme.c popt/findme.h popt/popt.3 popt/popt.c
        popt/popt.h popt/popt.ps popt/poptconfig.c popt/popthelp.c
        popt/poptint.h popt/poptparse.c popt/system.h popt/test1.c
        popt/test2.c popt/test3.c popt/testit.sh smap.hh
        sqlite/alter.c sqlite/keywordhash.h tests/README
        tests/t_add_executable.at
        tests/t_add_intermediate_MT_path.at tests/t_add_owndb.at
        tests/t_add_stomp_file.at tests/t_add_vs_commit.at
        tests/t_approval_semantics.at tests/t_at_sign.at
        tests/t_attr_drop.at tests/t_attr_init.at
        tests/t_automate_ancestors.at
        tests/t_automate_ancestry_difference.at
        tests/t_automate_descendents.at
        tests/t_automate_erase_ancestors.at
        tests/t_automate_graph.at tests/t_automate_heads.at
        tests/t_automate_leaves.at tests/t_automate_toposort.at
        tests/t_automate_version.at tests/t_bad_packets.at
        tests/t_branch_checkout.at tests/t_can_execute.at
        tests/t_cat_file_by_name.at tests/t_cdiff.at
        tests/t_change_empty_file.at tests/t_checkout_creates_log.at
        tests/t_checkout_id_sets_branch.at
        tests/t_checkout_noop_on_fail.at
        tests/t_command_completion.at tests/t_commit_log_1.at
        tests/t_commit_log_2.at tests/t_commit_log_3.at
        tests/t_cvsimport2.at tests/t_cvsimport_samelog.at
        tests/t_database_check.at tests/t_database_check_minor.at
        tests/t_db_execute.at tests/t_db_kill_rev_locally.at
        tests/t_db_missing.at tests/t_diff_binary.at
        tests/t_diff_currev.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_empty_env.at tests/t_empty_id_completion.at
        tests/t_empty_path.at tests/t_epoch.at
        tests/t_epoch_server.at tests/t_epoch_unidirectional.at
        tests/t_final_space.at tests/t_i18n_changelog.at
        tests/t_i18n_file_data.at tests/t_inodeprints.at
        tests/t_inodeprints_hook.at tests/t_inodeprints_update.at
        tests/t_inventory.at tests/t_largish_file.at
        tests/t_lf_crlf.at tests/t_load_into_existing.at
        tests/t_log_depth.at tests/t_log_depth_single.at
        tests/t_ls_known.at tests/t_lua_privkey.at
        tests/t_merge_3.at tests/t_merge_4.at tests/t_merge_5.at
        tests/t_merge_normalization_edge_case.at
        tests/t_merge_rename_file_and_rename_dir.at
        tests/t_monotone_agent.at tests/t_multiple_heads_msg.at
        tests/t_need_mt_revision.at tests/t_netsync_absorbs.at
        tests/t_netsync_checks_server_key.at
        tests/t_netsync_defaults.at tests/t_netsync_largish_file.at
        tests/t_netsync_set_defaults.at tests/t_netsync_sigpipe.at
        tests/t_no_rename_overwrite.at
        tests/t_normalized_filenames.at
        tests/t_override_author_date.at tests/t_parents_children.at
        tests/t_rcs_import.at tests/t_rebuild.at
        tests/t_rename_attr.at
        tests/t_rename_dir_add_dir_with_old_name.at
        tests/t_rename_file_to_dir.at
        tests/t_replace_dir_with_file.at
        tests/t_replace_file_with_dir.at
        tests/t_restrictions_warn_on_unknown.at
        tests/t_revert_dirs.at tests/t_revert_rename.at
        tests/t_revert_unchanged.at
        tests/t_setup_checkout_modify_new_dir.at
        tests/t_setup_creates_log.at tests/t_short_opts.at
        tests/t_sql_unpack.at tests/t_sticky_branch.at
        tests/t_subdir_attr.at tests/t_undo_update.at
        tests/t_update_nonexistent.at
        tests/t_update_null_revision.at tests/t_update_off_branch.at
        tests/t_vars.at unix/inodeprint.cc unix/platform_netsync.cc
        unix/process.cc unix/terminal.cc win32/inodeprint.cc
        win32/monotone.iss win32/platform_netsync.cc
        win32/process.cc win32/terminal.cc
Modified files:
        AUTHORS ChangeLog INSTALL Makefile.am NEWS README.changesets
        ROADMAP acinclude.m4 app_state.cc app_state.hh basic_io.cc
        basic_io.hh cert.cc cert.hh change_set.cc change_set.hh
        commands.cc configure.ac constants.cc constants.hh
        cryptopp/config.h cryptopp/dll.cpp cryptopp/integer.h
        cryptopp/iterhash.h cryptopp/modarith.h cryptopp/modes.h
        cryptopp/osrng.cpp cryptopp/osrng.h cryptopp/strciphr.h
        database.cc database.hh debian/changelog debian/control
        debian/copyright debian/docs debian/rules diff_patch.cc
        file_io.cc file_io.hh idna/toutf8.c interner.hh keys.cc
        keys.hh lua.cc lua.hh lua/liolib.c lua/lualib.h
        m4/acx_pthread.m4 m4/ax_create_stdint_h.m4 main.cc
        manifest.cc manifest.hh merkle_tree.cc merkle_tree.hh
        mkstemp.cc mkstemp.hh monotone.1 monotone.cc monotone.spec
        monotone.texi mt_version.cc netcmd.cc netcmd.hh netsync.cc
        netsync.hh numeric_vocab.hh packet.cc packet.hh platform.hh
        po/POTFILES.in po/monotone.pot rcs_file.cc rcs_import.cc
        revision.cc revision.hh sanity.cc sanity.hh schema.sql
        schema_migration.cc sqlite/attach.c sqlite/auth.c
        sqlite/btree.c sqlite/btree.h sqlite/build.c sqlite/date.c
        sqlite/delete.c sqlite/expr.c sqlite/func.c sqlite/hash.c
        sqlite/insert.c sqlite/main.c sqlite/opcodes.c
        sqlite/opcodes.h sqlite/os.h sqlite/os_unix.c
        sqlite/os_unix.h sqlite/os_win.c sqlite/pager.c
        sqlite/pager.h sqlite/parse.c sqlite/parse.h sqlite/pragma.c
        sqlite/select.c sqlite/sqlite3.h sqlite/sqliteInt.h
        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 tests/t_add_dot.at tests/t_ambig_update.at
        tests/t_attr.at tests/t_attributes.at
        tests/t_checkout_dir.at tests/t_checkout_options.at
        tests/t_cvsimport.at tests/t_db_with_dots.at
        tests/t_diff_added_file.at tests/t_dump_load.at
        tests/t_fmerge.at tests/t_fmerge_normalize.at
        tests/t_i18n_file.at tests/t_import.at tests/t_ls_missing.at
        tests/t_merge_add_del.at tests/t_migrate_schema.at
        tests/t_netsync.at tests/t_netsync_single.at
        tests/t_restrictions.at tests/t_revert.at tests/t_scan.at
        tests/t_status_missing.at tests/t_unidiff.at
        tests/t_update_2.at tests/t_vcheck.at tests/t_versions.at
        testsuite.at transforms.cc transforms.hh txt2c.cc ui.cc
        ui.hh unit_tests.cc unit_tests.hh unix/get_system_flavour.cc
        update.cc vocab.cc vocab.hh vocab_terms.hh
        win32/read_password.cc work.cc work.hh xdelta.cc

ChangeLog: 

explicit_merge of 79c056f9e7734307b9bc4b60c0505ed9ad6f88bf
              and 760fbde546281672dd6fa5e00846b36a51ccda13
   using ancestor 4641144947d55de85ca17ce313daa2ec5908b38e
        to branch 'net.venge.monotone.sqlite3'


monotone --db={your.database} diff 
--revision=760fbde546281672dd6fa5e00846b36a51ccda13 
--revision=4310b41fbacb43fb081ee1a31a928afddf96d679
monotone --db={your.database} diff 
--revision=79c056f9e7734307b9bc4b60c0505ed9ad6f88bf 
--revision=4310b41fbacb43fb081ee1a31a928afddf96d679
----------------------------------------------------------------------