[Monotone-commits-diffs] Revision 2c2971b2e6e4d07c359f70713a475f31ff8c31ef

[monotone]

-----------------------------------------------------------------
Revision: 2c2971b2e6e4d07c359f70713a475f31ff8c31ef
Ancestor: cbb11e1e8eea97e8b66854c2acfeb0ac6b3db896
Ancestor: dedb7e96fe917e0e8a30862b38e8092eefd7afa3
Author: Richard Levitte <address@hidden>
Date: 2008-02-26T05:38:49
Branch: net.venge.monotone.debian-diff

Deleted entries:
        tests/automate_get_revision/expected2
        tests/log_quits_on_SIGPIPE/hookfile tests/show_conflicts
        tests/show_conflicts/__driver__.lua
Renamed entries:
        tests/automate_db_set,get to tests/automate_db_variables
        tests/restricted_revert_bug to tests/revert_contents_not_parent_rename
        visualc/unit_tests.vcproj to visualc/unit_tester.vcproj
Added files:
        debian/patches/00list
        debian/patches/01_disable_SIGPIPE_test.dpatch
        debian/shlibs.local
        tests/automate_get_current_revision/__driver__.lua
        tests/automate_inventory_ignore_dirs/__driver__.lua
        tests/automate_inventory_ignore_dirs/expected.stderr
        tests/automate_inventory_ignore_dirs/expected.stdout
        tests/automate_inventory_ignore_dirs/local_hooks.lua
        tests/automate_inventory_options/__driver__.lua
        tests/automate_inventory_options/expected-no-ignored.stdout
        tests/automate_inventory_options/expected-no-unchanged.stdout
        tests/automate_inventory_options/expected-no-unknown.stdout
        tests/automate_inventory_options/expected-none.stdout
        tests/automate_inventory_options/expected-renames-both.stdout
        tests/automate_inventory_options/expected-renames-source.stdout
        
tests/automate_inventory_options/expected-renames-target-no-ignored.stdout
        
tests/automate_inventory_options/expected-renames-target-no-unknown.stdout
        tests/automate_inventory_options/expected-renames-target.stdout
        tests/automate_inventory_options/test_hooks.lua
        tests/calculation_of_unidiffs_start_of_file/__driver__.lua
        tests/calculation_of_unidiffs_start_of_file/firstfile
        tests/calculation_of_unidiffs_start_of_file/secondfile
        tests/conflict_messages/__driver__.lua
        tests/imp_test_filesync_confdir/__driver__.lua
        tests/merge_update_part_of_file/__driver__.lua
        tests/merge_update_part_of_file/after.diff
        tests/merge_update_part_of_file/before.diff
        tests/merge_update_part_of_file/onechange
        tests/merge_update_part_of_file/original
        tests/merge_update_part_of_file/twochanges
        tests/revert_drop_not_rename/__driver__.lua
        tests/update_with_pending_modification/__driver__.lua
Added directories:
        debian/patches tests/automate_get_current_revision
        tests/automate_inventory_ignore_dirs
        tests/automate_inventory_options
        tests/calculation_of_unidiffs_start_of_file
        tests/conflict_messages tests/imp_test_filesync_confdir
        tests/merge_update_part_of_file tests/revert_drop_not_rename
        tests/update_with_pending_modification
Modified files:
        .mtn-ignore AUTHORS Makefile.am NEWS UPGRADE automate.cc
        boost/circular_buffer_base.hpp cmd_automate.cc
        cmd_diff_log.cc cmd_files.cc cmd_key_cert.cc cmd_list.cc
        cmd_merging.cc cmd_netsync.cc cmd_ws_commit.cc configure.ac
        database.cc debian/changelog debian/control debian/rules
        diff_patch.cc diff_patch.hh globish.cc key_store.cc lcs.cc
        lru_writeback_cache.hh lua.cc m4/pcre.m4 merge.cc
        monotone.cc monotone.spec monotone.texi mtn-sanity.cc
        mtn-sanity.hh netsync.cc netxx/address.cxx netxx/peer.cxx
        netxx_pipe.cc options_list.hh paths.hh pcre/pcre.h
        pcre/pcre_compile.c pcre/pcre_config.c pcre/pcre_dfa_exec.c
        pcre/pcre_exec.c pcre/pcre_fullinfo.c pcre/pcre_get.c
        pcre/pcre_globals.c pcre/pcre_info.c pcre/pcre_internal.h
        pcre/pcre_maketables.c pcre/pcre_newline.c
        pcre/pcre_ord2utf8.c pcre/pcre_refcount.c pcre/pcre_study.c
        pcre/pcre_tables.c pcre/pcre_try_flipped.c
        pcre/pcre_ucp_searchfuncs.c pcre/pcre_valid_utf8.c
        pcre/pcre_version.c pcre/pcre_xclass.c pcre/pcresyntax.texi
        pcre/ucptable.h po/POTFILES.in po/de.po po/es.po po/it.po
        po/sv.po project.cc project.hh restrictions.cc
        restrictions.hh revision.cc roster.cc roster.hh
        roster_merge.cc roster_merge.hh sanity.hh ssh_agent.cc
        tester.cc tests/automate_db_variables/__driver__.lua
        tests/automate_get_current_revision_id/__driver__.lua
        tests/automate_get_revision/__driver__.lua
        tests/automate_inventory/__driver__.lua
        tests/automate_inventory_restricted/__driver__.lua
        tests/command_completion/__driver__.lua
        tests/log_quits_on_SIGPIPE/__driver__.lua
        tests/merge_into_workspace_files_added/__driver__.lua
        tests/normalized_filenames/__driver__.lua
        tests/pluck_lifecycle/__driver__.lua
        tests/restricted_diff_bug/__driver__.lua
        tests/revert_contents_not_parent_rename/__driver__.lua
        tests/server_initiated_sync/__driver__.lua
        tests/syntax_errors_in_.mtn-ignore/stderr-ref
        tests/test_hooks.lua
        tests/workspace_migration/__driver__.lua
        tests/ws_ops_with_wrong_node_type/__driver__.lua texinfo.css
        unix/fs.cc unix/terminal.cc unix/tester-plaf.cc update.cc
        visualc/config.h visualc/monotone.sln visualc/runtests.bat
        visualc/unit_tester.vcproj win32/main.cc win32/monotone.iss
        work.cc xdelta.cc

ChangeLog: 

explicit merge of 'dedb7e96fe917e0e8a30862b38e8092eefd7afa3'
              and 'cbb11e1e8eea97e8b66854c2acfeb0ac6b3db896'
        to branch 'net.venge.monotone.debian-diff'


monotone --db={your.database} diff 
--revision=cbb11e1e8eea97e8b66854c2acfeb0ac6b3db896 
--revision=2c2971b2e6e4d07c359f70713a475f31ff8c31ef
monotone --db={your.database} diff 
--revision=dedb7e96fe917e0e8a30862b38e8092eefd7afa3 
--revision=2c2971b2e6e4d07c359f70713a475f31ff8c31ef
----------------------------------------------------------------------