[Monotone-commits-diffs] Revision 762e95a6237156c60087a96f7af0600b16846760

[monotone]

-----------------------------------------------------------------
Revision: 762e95a6237156c60087a96f7af0600b16846760
Ancestor: 1f4ef73c3e056883c6a5ff66728dd764557db5e6
Ancestor: 734c39bb873f8fc83b8d54a7ad8e7a028864e4fc
Author: address@hidden
Date: 2005-05-24T08:30:20
Branch: net.venge.monotone.ssh

Deleted files:
        .mt-nonce debian/compat debian/files debian/monotone.1
        mac.hh os_specific.hh packet_types.hh sqlite/btree_rb.c
        sqlite/copy.c sqlite/os.c sqlite/sqlite.h
        tests/t_singlenetsync.at win32/read_password.c
Added files:
        .mt-attrs HACKING ROADMAP UPGRADE annotate.cc annotate.hh
        automate.cc automate.hh contrib/README
        contrib/ciabot_monotone.py contrib/monoprof.sh
        contrib/monotone-import.pl contrib/monotone-nav.el
        contrib/monotone-notify.pl contrib/monotone.bash_completion
        contrib/monotone.el contrib/monotone.zsh_completion
        contrib/mtbrowse.sh database_check.cc database_check.hh
        debian/compat doxygen.cfg epoch.cc epoch.hh gettext.h
        idna/idn-int.h inodeprint.cc inodeprint.hh lua/modemuncher.c
        mt_version.cc mt_version.hh options.hh
        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 restrictions.cc
        restrictions.hh selectors.cc selectors.hh smap.hh
        sqlite/alter.c sqlite/keywordhash.h sqlite/legacy.c
        sqlite/os_common.h sqlite/os_unix.c sqlite/os_unix.h
        sqlite/os_win.c sqlite/os_win.h sqlite/sqlite3.h
        sqlite/utf.c sqlite/vdbeapi.c sqlite/vdbemem.c tests/README
        tests/t_add_dot.at tests/t_add_drop_add.at
        tests/t_add_edge.at tests/t_add_executable.at
        tests/t_add_intermediate_MT_path.at tests/t_add_owndb.at
        tests/t_add_patch_drop_add.at tests/t_add_stomp_file.at
        tests/t_add_vs_commit.at tests/t_ambig_update.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_approval_semantics.at
        tests/t_at_sign.at tests/t_attr.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_attributes.at tests/t_automate_certs.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_inventory.at tests/t_automate_leaves.at
        tests/t_automate_select.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_check_same_db_contents.at
        tests/t_checkout_creates_log.at tests/t_checkout_dir.at
        tests/t_checkout_id_sets_branch.at
        tests/t_checkout_noop_on_fail.at tests/t_checkout_options.at
        tests/t_chkeypass.at tests/t_cleanup_empty_dir.at
        tests/t_cmdline_options.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_commit_message_file.at
        tests/t_crlf.at tests/t_cvsimport2.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_minor.at tests/t_db_execute.at
        tests/t_db_kill_rev_locally.at tests/t_db_missing.at
        tests/t_db_with_dots.at tests/t_delete_dir.at
        tests/t_delete_dir_patch.at tests/t_diff_added_file.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_drop_rename_patch.at
        tests/t_drop_vs_dropadd.at tests/t_drop_vs_patch_rename.at
        tests/t_dropkey_1.at tests/t_dropkey_2.at
        tests/t_dump_load.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_explicit_merge.at
        tests/t_final_space.at tests/t_fmerge_normalize.at
        tests/t_heads.at tests/t_heads_discontinuous_branch.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_largish_file.at
        tests/t_lca_1.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_log_nonexistent.at
        tests/t_ls_known.at tests/t_lua_privkey.at
        tests/t_merge2_add.at tests/t_merge2_add_drop_add.at
        tests/t_merge2_data.at tests/t_merge_1.at tests/t_merge_2.at
        tests/t_merge_3.at tests/t_merge_4.at tests/t_merge_5.at
        tests/t_merge_6.at tests/t_merge_add.at
        tests/t_merge_add_del.at tests/t_merge_ancestor.at
        tests/t_merge_binary.at
        tests/t_merge_normalization_edge_case.at
        tests/t_merge_rename_file_and_rename_dir.at
        tests/t_migrate_schema.at tests/t_monotone_agent.at
        tests/t_monotone_up.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_diffbranch.at
        tests/t_netsync_error.at tests/t_netsync_largish_file.at
        tests/t_netsync_nocerts.at tests/t_netsync_permissions.at
        tests/t_netsync_pubkey.at tests/t_netsync_repeated.at
        tests/t_netsync_set_defaults.at tests/t_netsync_sigpipe.at
        tests/t_netsync_single.at tests/t_netsync_unrelated.at
        tests/t_no_change_deltas.at tests/t_no_rename_overwrite.at
        tests/t_normalized_filenames.at tests/t_options.at
        tests/t_override_author_date.at tests/t_parents_children.at
        tests/t_patch_drop_add.at tests/t_patch_vs_drop_add.at
        tests/t_persistent_server_keys.at
        tests/t_persistent_server_keys_2.at
        tests/t_persistent_server_revision.at
        tests/t_propagate_anc.at tests/t_propagate_desc.at
        tests/t_rcfile_required.at tests/t_rcfile_stdin.at
        tests/t_rcs_import.at tests/t_rebuild.at
        tests/t_refresh_inodeprints.at
        tests/t_related_merge2_data.at
        tests/t_rename_added_in_rename.at tests/t_rename_attr.at
        tests/t_rename_conflict.at
        tests/t_rename_dir_add_dir_with_old_name.at
        tests/t_rename_dir_cross_level.at
        tests/t_rename_dir_patch.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.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_select_cert.at
        tests/t_selector_later_earlier.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_status_missing.at
        tests/t_sticky_branch.at tests/t_subdir_add.at
        tests/t_subdir_attr.at tests/t_subdir_drop.at
        tests/t_subdir_rename.at tests/t_subdir_revert.at
        tests/t_subdirs.at tests/t_tags.at tests/t_trusted.at
        tests/t_undo_update.at tests/t_unidiff3.at
        tests/t_unreadable_MT.at tests/t_update_1.at
        tests/t_update_2.at tests/t_update_inodeprints.at
        tests/t_update_nonexistent.at
        tests/t_update_null_revision.at tests/t_update_off_branch.at
        tests/t_update_to_revision.at
        tests/t_update_with_blocked_rename.at tests/t_vars.at
        tests/t_vcheck.at unix/get_system_flavour.cc
        unix/inodeprint.cc unix/platform_netsync.cc unix/process.cc
        unix/terminal.cc win32/get_system_flavour.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
        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 commands.hh configure.ac constants.cc
        constants.hh cryptopp/config.h cryptopp/cryptlib.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 cycle_detector.hh
        database.cc database.hh debian/changelog debian/control
        debian/copyright debian/docs debian/info debian/rules
        diff_patch.cc diff_patch.hh figures/cert.pdf
        figures/cert.png figures/oo-figures.sxd file_io.cc
        file_io.hh idna/toutf8.c interner.hh keys.cc keys.hh lcs.cc
        lcs.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 netcmd.cc netcmd.hh netio.hh netsync.cc
        netsync.hh netxx/address.cxx netxx/datagram.cxx
        netxx/osutil.h netxx/resolve_getaddrinfo.cxx
        netxx/resolve_gethostbyname.cxx netxx/serverbase.cxx
        netxx/streambase.cxx netxx/types.h numeric_vocab.hh
        packet.cc packet.hh platform.hh po/POTFILES.in
        po/monotone.pot quick_alloc.hh randomfile.hh rcs_file.cc
        rcs_import.cc revision.cc revision.hh sanity.cc sanity.hh
        schema.sql schema_migration.cc schema_migration.hh
        sqlite/attach.c sqlite/auth.c sqlite/btree.c sqlite/btree.h
        sqlite/build.c sqlite/config.h sqlite/date.c sqlite/delete.c
        sqlite/expr.c sqlite/func.c sqlite/hash.c sqlite/hash.h
        sqlite/insert.c sqlite/main.c sqlite/opcodes.c
        sqlite/opcodes.h sqlite/os.h sqlite/pager.c sqlite/pager.h
        sqlite/parse.c sqlite/parse.h sqlite/pragma.c
        sqlite/printf.c sqlite/random.c sqlite/select.c
        sqlite/sqliteInt.h sqlite/table.c sqlite/tokenize.c
        sqlite/trigger.c sqlite/update.c sqlite/util.c
        sqlite/vacuum.c sqlite/vdbe.c sqlite/vdbe.h sqlite/vdbeInt.h
        sqlite/vdbeaux.c sqlite/where.c std_hooks.lua tests/t_add.at
        tests/t_attributes.at tests/t_cross.at tests/t_cvsimport.at
        tests/t_cwork.at tests/t_disapprove.at
        tests/t_drop_missing.at tests/t_erename.at tests/t_fmerge.at
        tests/t_fork.at tests/t_genkey.at tests/t_i18n_file.at
        tests/t_import.at tests/t_ls_missing.at tests/t_merge.at
        tests/t_movedel.at tests/t_movepatch.at tests/t_netsync.at
        tests/t_null.at tests/t_persist_phrase.at tests/t_remerge.at
        tests/t_rename.at tests/t_renamed.at tests/t_revert.at
        tests/t_scan.at tests/t_single_char_filenames.at
        tests/t_testresult.at tests/t_unidiff.at tests/t_unidiff2.at
        tests/t_update.at tests/t_update_missing.at
        tests/t_versions.at testsuite.at transforms.cc transforms.hh
        txt2c.cc ui.cc ui.hh unit_tests.cc unit_tests.hh update.cc
        update.hh views.sql vocab.cc vocab.hh vocab_terms.hh
        win32/read_password.cc work.cc work.hh xdelta.cc xdelta.hh

ChangeLog: 

explicit_merge of 734c39bb873f8fc83b8d54a7ad8e7a028864e4fc
              and 1f4ef73c3e056883c6a5ff66728dd764557db5e6
   using ancestor 
        to branch 'net.venge.monotone.ssh'


monotone --db={your.database} diff 
--revision=1f4ef73c3e056883c6a5ff66728dd764557db5e6 
--revision=762e95a6237156c60087a96f7af0600b16846760
monotone --db={your.database} diff 
--revision=734c39bb873f8fc83b8d54a7ad8e7a028864e4fc 
--revision=762e95a6237156c60087a96f7af0600b16846760
----------------------------------------------------------------------