[Monotone-commits-nodiffs] Revision 816d233bcefd6932e0a8bcac9d8ae1904875dbbe

[monotone]

-----------------------------------------------------------------
Revision: 816d233bcefd6932e0a8bcac9d8ae1904875dbbe
Ancestor: 734c39bb873f8fc83b8d54a7ad8e7a028864e4fc
Ancestor: 78997a428c9a0158ded2c30314898ee35b0dc797
Author: address@hidden
Date: 2005-05-24T08:41:09
Branch: net.venge.monotone.sqlite3

Deleted files:
        contrib/Log2Gxl.java
Renamed files:
        tests/t_inventory.at to tests/t_automate_inventory.at
Added files:
        HACKING annotate.cc annotate.hh contrib/monoprof.sh
        contrib/monotone-nav.el contrib/monotone.zsh_completion
        contrib/mtbrowse.sh debian/compat options.hh restrictions.cc
        restrictions.hh selectors.cc selectors.hh
        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_automate_attributes.at tests/t_automate_certs.at
        tests/t_automate_select.at tests/t_commit_message_file.at
        tests/t_cvsimport3.at tests/t_cvsimport_deleted_invar.at
        tests/t_drop_vs_dropadd.at tests/t_drop_vs_patch_rename.at
        tests/t_merge_6.at tests/t_merge_binary.at
        tests/t_monotone_up.at tests/t_netsync_error.at
        tests/t_netsync_permissions.at tests/t_options.at
        tests/t_rcfile_stdin.at tests/t_refresh_inodeprints.at
        tests/t_select_cert.at tests/t_selector_later_earlier.at
        tests/t_unidiff3.at tests/t_unreadable_MT.at
        tests/t_update_inodeprints.at
        tests/t_update_with_blocked_rename.at
Modified files:
        .mt-attrs AUTHORS ChangeLog INSTALL Makefile.am NEWS ROADMAP
        UPGRADE app_state.cc app_state.hh automate.cc basic_io.cc
        basic_io.hh change_set.cc commands.cc commands.hh
        configure.ac constants.cc constants.hh contrib/README
        contrib/monotone-notify.pl contrib/monotone.bash_completion
        contrib/monotone.el cryptopp/cryptlib.h cycle_detector.hh
        database.cc database.hh database_check.hh debian/changelog
        debian/control debian/copyright debian/docs debian/info
        debian/rules diff_patch.cc diff_patch.hh file_io.cc
        file_io.hh interner.hh lcs.cc lcs.hh lua.cc lua.hh
        manifest.cc manifest.hh mkstemp.cc monotone.1 monotone.cc
        monotone.spec monotone.texi 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 packet.cc packet.hh
        platform.hh po/monotone.pot quick_alloc.hh randomfile.hh
        rcs_file.cc rcs_import.cc revision.cc revision.hh sanity.cc
        sanity.hh schema_migration.cc std_hooks.lua tests/README
        tests/t_add_intermediate_MT_path.at tests/t_attr.at
        tests/t_attributes.at tests/t_automate_heads.at
        tests/t_automate_inventory.at
        tests/t_checkout_id_sets_branch.at
        tests/t_checkout_noop_on_fail.at tests/t_checkout_options.at
        tests/t_cvsimport2.at tests/t_cvsimport_manifest_cycle.at
        tests/t_cwork.at tests/t_delete_dir.at
        tests/t_delete_dir_patch.at tests/t_empty_path.at
        tests/t_i18n_file.at tests/t_i18n_file_data.at
        tests/t_inodeprints_hook.at tests/t_inodeprints_update.at
        tests/t_largish_file.at tests/t_lf_crlf.at
        tests/t_netsync_defaults.at tests/t_netsync_set_defaults.at
        tests/t_netsync_sigpipe.at tests/t_netsync_single.at
        tests/t_override_author_date.at
        tests/t_persistent_server_revision.at
        tests/t_rcfile_required.at tests/t_rename_added_in_rename.at
        tests/t_rename_attr.at tests/t_rename_dir_cross_level.at
        tests/t_rename_dir_patch.at tests/t_short_opts.at
        tests/t_single_char_filenames.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_tags.at
        tests/t_update_missing.at tests/t_update_off_branch.at
        tests/t_versions.at testsuite.at transforms.cc transforms.hh
        ui.cc unix/get_system_flavour.cc unix/inodeprint.cc
        unix/process.cc vocab.cc win32/get_system_flavour.cc
        win32/inodeprint.cc win32/monotone.iss win32/process.cc
        win32/terminal.cc work.cc work.hh xdelta.cc xdelta.hh

ChangeLog: 

explicit_merge of 78997a428c9a0158ded2c30314898ee35b0dc797
              and 734c39bb873f8fc83b8d54a7ad8e7a028864e4fc
   using ancestor c102d5529ca3c7df5beefe5a6d28ebee30e5bed0
        to branch 'net.venge.monotone.sqlite3'


monotone --db={your.database} diff 
--revision=734c39bb873f8fc83b8d54a7ad8e7a028864e4fc 
--revision=816d233bcefd6932e0a8bcac9d8ae1904875dbbe
monotone --db={your.database} diff 
--revision=78997a428c9a0158ded2c30314898ee35b0dc797 
--revision=816d233bcefd6932e0a8bcac9d8ae1904875dbbe
----------------------------------------------------------------------