[Monotone-commits-diffs] Revision 47c0d8167bdfb6afeaad49508a7cab90d235c09c

[monotone]

-----------------------------------------------------------------
Revision: 47c0d8167bdfb6afeaad49508a7cab90d235c09c
Ancestor: 6dea8dc38e6f14cd9fbedee6b2ca2c9ff9e35d31
Ancestor: 9d40e0fc291b77a793b08070d5a018863bb2d153
Author: address@hidden
Date: 2008-09-27T23:29:33
Branch: net.venge.monotone.resolve_conflicts

Added files:
        cmd_conflicts.cc tests/automate_file_merge/__driver__.lua
        tests/resolve_conflicts_all_merge_commands/__driver__.lua
        tests/resolve_conflicts_all_resolutions/__driver__.lua
        tests/resolve_conflicts_all_resolutions/conflicts-1
        tests/resolve_conflicts_all_resolutions/conflicts-resolved
        tests/resolve_conflicts_all_resolutions/merge-1
        tests/resolve_conflicts_all_resolutions/merge3_hook.lua
        tests/resolve_conflicts_all_resolutions/show_first-checkout_left
        tests/resolve_conflicts_all_resolutions/show_first-checkout_right
        tests/resolve_conflicts_all_resolutions/show_first-interactive
        tests/resolve_conflicts_all_resolutions/show_first-thermostat
        tests/resolve_conflicts_all_resolutions/show_first-user
        tests/resolve_conflicts_all_resolutions/show_remaining-checkout_left
        tests/resolve_conflicts_all_resolutions/show_remaining-thermostat
        tests/resolve_conflicts_errors/__driver__.lua
        tests/resolve_conflicts_errors/conflicts-attr-show-1
        tests/resolve_conflicts_errors/conflicts-attr-show-2
        tests/resolve_conflicts_errors/conflicts-attr-store-1
        tests/resolve_conflicts_errors/conflicts-attr-store-2
        tests/resolve_conflicts_read_all/__driver__.lua
        tests/resolve_conflicts_read_all/attribute-attached_left
        tests/resolve_conflicts_read_all/attribute-attached_right
        tests/resolve_conflicts_read_all/attribute-detached_left
        tests/resolve_conflicts_read_all/attribute-detached_right
        tests/resolve_conflicts_read_all/content-attached_left
        tests/resolve_conflicts_read_all/content-attached_right
        tests/resolve_conflicts_read_all/content-detached_left
        tests/resolve_conflicts_read_all/content-detached_right
        tests/resolve_conflicts_read_all/directory-loop_left
        tests/resolve_conflicts_read_all/directory-loop_right
        tests/resolve_conflicts_read_all/duplicate-add-rename_left
        tests/resolve_conflicts_read_all/duplicate-add-rename_right
        tests/resolve_conflicts_read_all/duplicate-adds_left
        tests/resolve_conflicts_read_all/duplicate-adds_right
        
tests/resolve_conflicts_read_all/duplicate-name-multiple-name-missing-root_left
        
tests/resolve_conflicts_read_all/duplicate-name-multiple-name-missing-root_right
        tests/resolve_conflicts_read_all/duplicate-renames_left
        tests/resolve_conflicts_read_all/duplicate-renames_right
        tests/resolve_conflicts_read_all/invalid-add_left
        tests/resolve_conflicts_read_all/invalid-add_right
        tests/resolve_conflicts_read_all/invalid-rename_left
        tests/resolve_conflicts_read_all/invalid-rename_right
        tests/resolve_conflicts_read_all/missing-root_left
        tests/resolve_conflicts_read_all/missing-root_right
        tests/resolve_conflicts_read_all/multiple-name-plus-directory-loop_left
        tests/resolve_conflicts_read_all/multiple-name-plus-directory-loop_right
        tests/resolve_conflicts_read_all/multiple-name-plus-duplicate-name_left
        tests/resolve_conflicts_read_all/multiple-name-plus-duplicate-name_right
        tests/resolve_conflicts_read_all/multiple-name-plus-orphan_left
        tests/resolve_conflicts_read_all/multiple-name-plus-orphan_right
        tests/resolve_conflicts_read_all/multiple-names_left
        tests/resolve_conflicts_read_all/multiple-names_right
        tests/resolve_conflicts_read_all/orphaned-add_left
        tests/resolve_conflicts_read_all/orphaned-add_right
        tests/resolve_conflicts_read_all/orphaned-rename_left
        tests/resolve_conflicts_read_all/orphaned-rename_right
        tests/resolve_conflicts_read_all/unrelated-projects_left
        tests/resolve_conflicts_read_all/unrelated-projects_right
        tests/resolve_content_conflict/__driver__.lua
        tests/resolve_content_conflict/conflicts-1
        tests/resolve_content_conflict/conflicts-2
        tests/resolve_content_conflict/merge-1
        tests/resolve_content_conflict/update-1
        tests/resolve_duplicate_name_conflict/conflicts-1
        tests/resolve_duplicate_name_conflict/conflicts-resolved
        tests/resolve_duplicate_name_conflict/merge-1
Added directories:
        tests/automate_file_merge
        tests/resolve_conflicts_all_merge_commands
        tests/resolve_conflicts_all_resolutions
        tests/resolve_conflicts_errors
        tests/resolve_conflicts_read_all
        tests/resolve_content_conflict
Modified files:
        HACKING Makefile.am asciik.cc automate.cc basic_io.cc
        basic_io.hh cert.cc cmd.hh 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 commands.cc database.cc
        diff_patch.cc diff_patch.hh globish.cc keys.cc lua_hooks.cc
        merge.cc merge.hh monotone.cc monotone.texi mt_version.cc
        netsync.cc netxx/socket.cxx notes/release-checklist.txt
        options_list.hh packet.cc paths.cc paths.hh randomfile.hh
        rcs_import.cc rev_height.hh roster.cc roster.hh
        roster_merge.cc roster_merge.hh schema_migration.cc
        selectors.cc simplestring_xform.cc string_queue.cc tester.cc
        testlib.lua
        tests/automate_show_conflicts/expected-content-attached.stdout
        tests/automate_show_conflicts/expected-directory-loop.stdout
        tests/empty_string_as_a_path_name/__driver__.lua
        tests/resolve_duplicate_name_conflict/__driver__.lua ui.cc
        vocab.cc work.cc xdelta.cc
Modified attrs:
        tests/resolve_conflicts_errors/__driver__.lua
        tests/resolve_conflicts_errors/conflicts-attr-store-1

ChangeLog: 

propagate from branch 'net.venge.monotone' (head 
6dea8dc38e6f14cd9fbedee6b2ca2c9ff9e35d31)
            to branch 'net.venge.monotone.resolve_conflicts' (head 
9d40e0fc291b77a793b08070d5a018863bb2d153)


monotone --db={your.database} diff 
--revision=6dea8dc38e6f14cd9fbedee6b2ca2c9ff9e35d31 
--revision=47c0d8167bdfb6afeaad49508a7cab90d235c09c
monotone --db={your.database} diff 
--revision=9d40e0fc291b77a793b08070d5a018863bb2d153 
--revision=47c0d8167bdfb6afeaad49508a7cab90d235c09c
----------------------------------------------------------------------