[Monotone-commits-diffs] Revision a124bfee214acc714f2bc0743ce6fbd975628fb4

[monotone]

-----------------------------------------------------------------
Revision: a124bfee214acc714f2bc0743ce6fbd975628fb4
Ancestor: 0da73aedc2990f2d033ae537e7af0c7c79864bda
Ancestor: b15276a9f9767fc1bfa538131501c14b82674220
Author: address@hidden
Date: 2007-02-28T10:51:04
Branch: net.venge.monotone.cvssync.candidates

Renamed entries:
        tests/a_tricky_cvs_repository_with_tags/e to 
tests/a_tricky_cvs_repository_with_tags/cvs-repository
        tests/cvs_import,_deleted_file_invariant/attest to 
tests/cvs_import,_deleted_file_invariant/cvs-repository/test
        tests/cvs_import,_file_dead_on_head_and_branch/cvsfile,v to 
tests/cvs_import,_file_dead_on_head_and_branch/cvs-repository/test/cvsfile,v
        tests/importing_a_small,_real_cvs_repository/e to 
tests/importing_a_small,_real_cvs_repository/cvs-repository
        tests/test_problematic_cvs_import/rcsfile,v to 
tests/test_problematic_cvs_import/cvs-repository/test/rcsfile,v
Added files:
        tests/automate_put_revision_for_merge/__driver__.lua
        tests/fetching_nonexistent_entry_from_children_bug/__driver__.lua
        tests/spawn_pipe/__driver__.lua tests/spawn_pipe/testhooks
Added directories:
        tests/automate_put_revision_for_merge
        tests/cvs_import,_deleted_file_invariant/cvs-repository
        tests/cvs_import,_file_dead_on_head_and_branch/cvs-repository
        tests/cvs_import,_file_dead_on_head_and_branch/cvs-repository/test
        tests/fetching_nonexistent_entry_from_children_bug
        tests/spawn_pipe
        tests/test_problematic_cvs_import/cvs-repository
        tests/test_problematic_cvs_import/cvs-repository/test
Modified files:
        HACKING Makefile.am NEWS annotate.cc automate.cc
        cmd_automate.cc cmd_db.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 commands.cc configure.ac
        contrib/ciabot_monotone_hookversion.py
        contrib/monotone-notify.pl contrib/usher.cc database.cc
        debian/changelog diff_patch.cc keys.cc lua_hooks.cc
        luaext_platform.cc monotone.cc monotone.spec monotone.texi
        mt_version.cc packet.cc paths.cc platform.hh po/de.po
        po/sv.po rcs_file.cc revision.cc roster.cc sanity.cc
        simplestring_xform.cc tester.cc
        tests/a_tricky_cvs_repository_with_tags/__driver__.lua
        tests/automate_cert/__driver__.lua
        tests/automate_put_file/__driver__.lua
        tests/automate_put_revision/__driver__.lua
        tests/automate_put_revision_unknown_file/__driver__.lua
        tests/cvs_import,_deleted_file_invariant/__driver__.lua
        tests/cvs_import,_file_dead_on_head_and_branch/__driver__.lua
        tests/diff_against_empty_file/expected.diff
        tests/importing_a_small,_real_cvs_repository/__driver__.lua
        tests/merge_into_workspace/__driver__.lua
        tests/merge_into_workspace/expected-log
        tests/merge_into_workspace/expected-log-left
        tests/merge_into_workspace/expected-manifest
        tests/merge_into_workspace_attr_corpse/expected-roster
        tests/merge_into_workspace_files_added/expected-revision
        tests/merging_(add_a,_rename_a_b)_with_(add_b)/__driver__.lua
        tests/rename_dir_to_non-sibling/__driver__.lua
        tests/test_problematic_cvs_import/__driver__.lua
        tests/two_parent_workspace_list/__driver__.lua
        tests/ws_ops_with_wrong_node_type/__driver__.lua
        testsuite.lua txt2c.cc ui.cc unit_tests.cc unix/process.cc
        unix/read_password.cc visualc/config.h win32/monotone.iss
        win32/process.cc win32/read_password.cc

ChangeLog: 

merge of '0da73aedc2990f2d033ae537e7af0c7c79864bda'
     and 'b15276a9f9767fc1bfa538131501c14b82674220'


monotone --db={your.database} diff 
--revision=0da73aedc2990f2d033ae537e7af0c7c79864bda 
--revision=a124bfee214acc714f2bc0743ce6fbd975628fb4
monotone --db={your.database} diff 
--revision=b15276a9f9767fc1bfa538131501c14b82674220 
--revision=a124bfee214acc714f2bc0743ce6fbd975628fb4
----------------------------------------------------------------------