[Monotone-commits-diffs] Revision c9bba1b5655cf8b553fd38399a8fc7fce5fff8ed

[monotone]

-----------------------------------------------------------------
Revision: c9bba1b5655cf8b553fd38399a8fc7fce5fff8ed
Ancestor: 93e7e626c6ee8db33a21eabcfab00d97f1bed8c2
Ancestor: c756fb4eb08a117a0646c56594720f2203a80c08
Author: address@hidden
Date: 2008-11-30T01:36:40
Branch: net.venge.monotone.stripped

Renamed entries:
        botan to Attic/botan
        idna to Attic/idna
        lua to Attic/lua
        pcre to Attic/pcre
        pcre/pcrepattern.texi to pcrepattern.texi
        pcre/pcresyntax.texi to pcresyntax.texi
        sha1.hh to Attic/sha1.hh
        sha1_engine.hh to Attic/sha1_engine.hh
        sqlite to Attic/sqlite
        tests/resolve_duplicate_name_conflict to 
tests/resolve_conflicts_duplicate_name
Added files:
        cmd_conflicts.cc m4/botan.m4 m4/idna.m4 m4/lua.m4
        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_content/__driver__.lua
        tests/resolve_conflicts_content/conflicts-1
        tests/resolve_conflicts_content/conflicts-2
        tests/resolve_conflicts_content/merge-1
        tests/resolve_conflicts_content/update-1
        tests/resolve_conflicts_duplicate_name/conflicts-1
        tests/resolve_conflicts_duplicate_name/conflicts-resolved
        tests/resolve_conflicts_duplicate_name/merge-1
        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_errors/merge-old-conflicts-file
        tests/resolve_conflicts_multiple_names/__driver__.lua
        tests/resolve_conflicts_none/__driver__.lua
        tests/resolve_conflicts_none/conflicts-1
        tests/resolve_conflicts_none/merge-1
        tests/resolve_conflicts_none/update-1
        tests/resolve_conflicts_propagate/__driver__.lua
        tests/resolve_conflicts_propagate/conflicts-1
        tests/resolve_conflicts_propagate/conflicts-2
        tests/resolve_conflicts_propagate/conflicts-resolved
        tests/resolve_conflicts_propagate/propagate-1
        tests/resolve_conflicts_propagate/propagate-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
Added directories:
        Attic tests/automate_file_merge
        tests/resolve_conflicts_all_merge_commands
        tests/resolve_conflicts_all_resolutions
        tests/resolve_conflicts_content
        tests/resolve_conflicts_errors
        tests/resolve_conflicts_multiple_names
        tests/resolve_conflicts_none
        tests/resolve_conflicts_propagate
        tests/resolve_conflicts_read_all
Modified files:
        Attic/sha1_engine.hh INSTALL Makefile.am NEWS app_state.cc
        app_state.hh base.hh basic_io.cc basic_io.hh
        botan_pipe_cache.hh charset.cc cmd.hh cmd_automate.cc
        cmd_merging.cc commands.cc configure.ac database.cc
        database.hh debian/control diff_patch.cc diff_patch.hh
        file_io.cc gzip.cc hmac.cc hmac.hh inodeprint.cc
        key_store.cc key_store.hh lua.hh lua_hooks.cc m4/pcre.m4
        m4/sqlite.m4 merge.cc merge.hh merkle_tree.cc mkstemp.cc
        monotone.cc monotone.texi mt_version.cc netsync.cc
        options_list.hh paths.cc paths.hh pcrewrap.hh po/es.po
        revision.cc roster.cc roster.hh roster_merge.cc
        roster_merge.hh schema_migration.cc sha1.cc ssh_agent.cc
        tester.cc testlib.lua
        tests/automate_show_conflicts/__driver__.lua
        tests/automate_show_conflicts/expected-content-attached.stdout
        tests/automate_show_conflicts/expected-directory-loop.stdout
        tests/empty_environment/__driver__.lua
        tests/empty_string_as_a_path_name/__driver__.lua
        tests/fail_cleanly_on_unreadable_db/__driver__.lua
        tests/resolve_conflicts_duplicate_name/__driver__.lua
        tests/schema_migration_with_rosterify/__driver__.lua
        transforms.cc unit_tests.cc work.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 
93e7e626c6ee8db33a21eabcfab00d97f1bed8c2)
            to branch 'net.venge.monotone.stripped' (head 
c756fb4eb08a117a0646c56594720f2203a80c08)


monotone --db={your.database} diff 
--revision=93e7e626c6ee8db33a21eabcfab00d97f1bed8c2 
--revision=c9bba1b5655cf8b553fd38399a8fc7fce5fff8ed
monotone --db={your.database} diff 
--revision=c756fb4eb08a117a0646c56594720f2203a80c08 
--revision=c9bba1b5655cf8b553fd38399a8fc7fce5fff8ed
----------------------------------------------------------------------