[Monotone-commits-diffs] Revision f2422e975f4a7e17bf41fdc4ea08bcf04c274aa7

[monotone]

-----------------------------------------------------------------
Revision: f2422e975f4a7e17bf41fdc4ea08bcf04c274aa7
Ancestor: 0c0f8b765d6e18d2d20f66cb3539c30c2918e8fe
Ancestor: efcd324d5687d46580fe1d378d829e0486514ab3
Author: address@hidden
Date: 2008-04-16T14:24:21
Branch: net.venge.monotone.automate_show_conflict

Added files:
        tests/automate_show_conflicts/__driver__.lua
        tests/automate_show_conflicts/expected-attribute-attached.stdout
        tests/automate_show_conflicts/expected-attribute-detached.stdout
        tests/automate_show_conflicts/expected-content-attached.stdout
        tests/automate_show_conflicts/expected-content-detached.stdout
        tests/automate_show_conflicts/expected-directory-loop.stdout
        tests/automate_show_conflicts/expected-duplicate-add-rename.stdout
        tests/automate_show_conflicts/expected-duplicate-adds.stdout
        
tests/automate_show_conflicts/expected-duplicate-name-multiple-name-missing-root.stdout
        tests/automate_show_conflicts/expected-duplicate-renames.stdout
        tests/automate_show_conflicts/expected-invalid-add.stdout
        tests/automate_show_conflicts/expected-invalid-rename.stdout
        tests/automate_show_conflicts/expected-missing-root.stdout
        
tests/automate_show_conflicts/expected-multiple-name-plus-directory-loop.stdout
        
tests/automate_show_conflicts/expected-multiple-name-plus-duplicate-name.stdout
        tests/automate_show_conflicts/expected-multiple-name-plus-orphan.stdout
        tests/automate_show_conflicts/expected-multiple-names.stdout
        tests/automate_show_conflicts/expected-orphaned-add.stdout
        tests/automate_show_conflicts/expected-orphaned-rename.stdout
        tests/automate_show_conflicts/expected-unrelated-projects.stdout
        tests/automate_show_conflicts_defaults/__driver__.lua
        tests/merge_with_conflicting_name_and_renamed_dir/expected.stdout
        tests/resolve_duplicate_name_conflict/__driver__.lua
        
tests/schema_migration/212dd25a23bfd7bfe030ab910e9d62aa66aa2955.mtn.dumped
        tests/schema_migration_error_recovery/bad_hexenc.dump
        tests/schema_migration_error_recovery/short_hexenc.dump
        tests/select_partial_id/__driver__.lua
Added directories:
        tests/automate_show_conflicts
        tests/automate_show_conflicts_defaults
        tests/resolve_duplicate_name_conflict
        tests/select_partial_id
Modified files:
        Makefile.am NEWS UPGRADE annotate.cc automate.cc basic_io.cc
        basic_io.hh cert.cc cert.hh 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 constants.hh crypto_tests.cc cset.cc
        database.cc database.hh database_check.cc debian/NEWS
        debian/changelog debian/monotone-server.postinst
        diff_patch.cc diff_patch.hh enumerator.cc enumerator.hh
        epoch.cc figures/monotone-logo.svg file_io.cc file_io.hh
        graph.cc graph.hh key_store.cc key_store.hh keys.cc keys.hh
        legacy.cc lua_hooks.cc lua_hooks.hh merge.cc merkle_tree.cc
        merkle_tree.hh monotone.cc monotone.spec monotone.texi
        netsync.cc notes/release-checklist.txt options_list.hh
        packet.cc po/de.po po/es.po po/sv.po project.cc project.hh
        rcs_import.cc refiner.cc restrictions.cc rev_types.hh
        revision.cc roster.cc roster_delta.cc roster_merge.cc
        roster_merge.hh schema.sql schema_migration.cc selectors.cc
        sha1.cc ssh_agent.cc ssh_agent.hh
        tests/commit_use_workspace_keydir/__driver__.lua
        tests/common/test_utils_inventory.lua
        tests/conflict_messages/__driver__.lua
        tests/database_check/__driver__.lua
        tests/db_check_(heights)/__driver__.lua
        tests/db_check_and_non-serious_errors/__driver__.lua
        tests/merge_with_conflicting_name_and_renamed_dir/__driver__.lua
        tests/netsync_mtn_uri_scheme/__driver__.lua
        tests/non_workspace_keydir/__driver__.lua
        tests/schema_migration/__driver__.lua
        tests/schema_migration_error_recovery/__driver__.lua
        tests/ssh_agent/__driver__.lua transforms.cc transforms.hh
        uri.cc uri.hh visualc/config.h vocab.cc vocab.hh
        vocab_hash.hh vocab_macros.hh vocab_terms.hh
        win32/monotone.bmp win32/monotone.iss work.cc
        work_migration.cc xdelta.cc xdelta.hh

ChangeLog: 

propagate from branch 'net.venge.monotone' (head 
0c0f8b765d6e18d2d20f66cb3539c30c2918e8fe)
            to branch 'net.venge.monotone.automate_show_conflict' (head 
efcd324d5687d46580fe1d378d829e0486514ab3)


monotone --db={your.database} diff 
--revision=0c0f8b765d6e18d2d20f66cb3539c30c2918e8fe 
--revision=f2422e975f4a7e17bf41fdc4ea08bcf04c274aa7
monotone --db={your.database} diff 
--revision=efcd324d5687d46580fe1d378d829e0486514ab3 
--revision=f2422e975f4a7e17bf41fdc4ea08bcf04c274aa7
----------------------------------------------------------------------