[Monotone-commits-diffs] Revision 0506517ee935af2526032e3e260b09dbf26c5b45

[monotone]

-----------------------------------------------------------------
Revision: 0506517ee935af2526032e3e260b09dbf26c5b45
Ancestor: 046abc2308f58429e52b2046bf7cb974ed08768c
Ancestor: 3205ca2b33057ee99c9e7fd1741a772af1db0ac3
Author: address@hidden
Date: 2008-12-28T18:14:27
Branch: net.venge.monotone.dates.statistics

Renamed entries:
        tests/--no-workspace to tests/_--no-workspace
        tests/resolve_duplicate_name_conflict to 
tests/resolve_conflicts_duplicate_name
Added files:
        cmd_conflicts.cc tests/attr_mtn_execute/__driver__.lua
        tests/automate_file_merge/__driver__.lua
        tests/automate_lua/__driver__.lua
        tests/automate_lua/test.lua
        tests/invalid__MTN_options/__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:
        tests/attr_mtn_execute tests/automate_file_merge
        tests/automate_lua tests/invalid__MTN_options
        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:
        AUTHORS Makefile.am NEWS UPGRADE automate.cc basic_io.cc
        basic_io.hh botan/README.botan-monotone cert.cc cert.hh
        cmd.hh cmd_automate.cc cmd_db.cc cmd_merging.cc
        cmd_packet.cc commands.cc configure.ac
        contrib/ciabot_monotone.py database.cc database.hh
        debian/rules diff_patch.cc diff_patch.hh globish.cc
        globish.hh gzip.cc gzip.hh key_store.cc lua/luaconf.h lua.cc
        lua.hh lua_hooks.cc lua_hooks.hh merge.cc merge.hh
        merkle_tree.cc monotone.spec monotone.texi netcmd.cc
        netio.hh netsync.cc notes/release-checklist.txt
        options_list.hh paths.cc paths.hh po/LINGUAS po/POTFILES.in
        po/de.po po/es.po po/fr.po po/it.po po/sv.po revision.cc
        revision.hh roster.cc roster.hh roster_merge.cc
        roster_merge.hh sanity.hh std_hooks.lua 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_string_as_a_path_name/__driver__.lua
        tests/resolve_conflicts_duplicate_name/__driver__.lua
        tests/schema_migration_with_rosterify/__driver__.lua
        tests/two_parent_workspace_commands_that_fail/__driver__.lua
        tests/user_commands/__driver__.lua
        tests/user_commands/extra_rc transforms.hh visualc/config.h
        vocab.cc vocab.hh vocab_macros.hh win32/README
        win32/monotone.iss 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.dates' (head 
3205ca2b33057ee99c9e7fd1741a772af1db0ac3)
            to branch 'net.venge.monotone.dates.statistics' (head 
046abc2308f58429e52b2046bf7cb974ed08768c)


monotone --db={your.database} diff 
--revision=046abc2308f58429e52b2046bf7cb974ed08768c 
--revision=0506517ee935af2526032e3e260b09dbf26c5b45
monotone --db={your.database} diff 
--revision=3205ca2b33057ee99c9e7fd1741a772af1db0ac3 
--revision=0506517ee935af2526032e3e260b09dbf26c5b45
----------------------------------------------------------------------