[Monotone-commits-diffs] Revision 3011908f7f234e48e5d90160cb406f02f09c19d2

[monotone]

-----------------------------------------------------------------
Revision: 3011908f7f234e48e5d90160cb406f02f09c19d2
Ancestor: 05a0f9ce71013e8bc5c04c825a53d17a5e3007a9
Ancestor: 55e9a3b0f89c309660f3c39877469fa1c56b6ec4
Author: address@hidden
Date: 2007-09-02T03:35:35
Branch: net.venge.monotone.workspace-merge.conflict1

Deleted entries:
        contrib/mashschema.cc contrib/monotone-import.pl
        contrib/usher.cc m4/ax_create_stdint_h.m4 mtn.1 netsync.hh
        tests/common/cvs.lua
        
tests/schema_migration/2881277287f6ee9bfc5ee255a503a6dc20dd5994.mtn.dumped
Renamed entries:
        tester.lua to testlib.lua
        tests/a_tricky_cvs_repository_with_tags to 
tests/importing_cvs_tricky_repo_with_tags
        tests/a_tricky_cvs_repository_with_tags/e to 
tests/importing_cvs_tricky_repo_with_tags/cvs-repository
        tests/automate_attributes to tests/automate_get_attributes
        tests/cvs_import,_deleted_file_invariant to 
tests/importing_cvs_deleted_file
        tests/cvs_import,_deleted_file_invariant/attest to 
tests/importing_cvs_deleted_file/cvs-repository/test
        tests/cvs_import,_file_dead_on_head_and_branch to 
tests/importing_cvs_file_dead_on_head_and_branch
        tests/cvs_import,_file_dead_on_head_and_branch/cvsfile,v to 
tests/importing_cvs_file_dead_on_head_and_branch/cvs-repository/test/cvsfile,v
        tests/cvs_import_with_file_added_on_a_branch to 
tests/importing_cvs_file_added_on_a_branch
        tests/importing_a_cvs_file_with_one_version to 
tests/importing_cvs_file_with_one_version
        tests/importing_a_small,_real_cvs_repository to 
tests/importing_cvs_small_real_repo
        tests/importing_a_small,_real_cvs_repository/e to 
tests/importing_cvs_small_real_repo/cvs-repository
        tests/importing_cvs_branches_with_correct_ancestory to 
tests/importing_cvs_branches
        tests/test_problematic_cvs_import to 
tests/importing_cvs_problematic_repo
        tests/test_problematic_cvs_import/rcsfile,v to 
tests/importing_cvs_problematic_repo/cvs-repository/test/rcsfile,v
        testsuite.lua to lua-testsuite.lua
Added files:
        asciik.cc asciik.hh audit-includes base.hh
        contrib/Monotone.pm contrib/README.missing
        contrib/extra-commands.lua contrib/lua-mode.el
        contrib/monotone-buildbot-notification.lua
        contrib/monotone-cluster-push.lua
        contrib/monotone-log-of-pulled-revs-hook.lua
        contrib/monotone-mirror-postaction-push.sh
        contrib/monotone-mirror.lua contrib/mtn_makepermissions
        contrib/recreate-manifest-tables.sh current_exception.hh
        dates.cc dates.hh debian/monotone.manpages debian/mtn.1
        debian/po/cs.po debian/po/de.po debian/po/ja.po
        debian/po/nl.po debian/po/pt.po debian/po/sv.po
        examples/push.rc hybrid_map.hh lexical_cast.hh
        m4/iconv_translit.m4 m4/numeric_vocab.m4
        mac/monotone-pkg-logo.gif mac/monotone.pmproj
        mac/package-intro.rtf mac/readme-mac.txt
        specialized_lexical_cast.cc sqlite/btreeInt.h
        sqlite/malloc.c sqlite/sqliteLimit.h sqlite/vdbeblob.c
        ssh_agent.cc ssh_agent.hh tester-plaf.hh
        tests/add_unknown_ignored/__driver__.lua
        tests/add_unknown_recursive/__driver__.lua
        tests/add_unknown_recursive_ignored/__driver__.lua
        tests/alias_command/__driver__.lua
        tests/alias_command/extra_rc
        tests/annotate_accidental_clean_merge/__driver__.lua
        tests/automate_cert/__driver__.lua
        tests/automate_cert/expected
        tests/automate_commands_are_not_completed/__driver__.lua
        tests/automate_db_set,get/__driver__.lua
        tests/automate_identify/__driver__.lua
        tests/automate_put_file/__driver__.lua
        tests/automate_put_revision/__driver__.lua
        tests/automate_put_revision_for_merge/__driver__.lua
        tests/automate_put_revision_unknown_file/__driver__.lua
        tests/automate_roots/__driver__.lua
        tests/automate_set_drop_attribute/__driver__.lua
        tests/clone_-b_no_dir/__driver__.lua
        tests/clone_creates__MTN_log/__driver__.lua
        tests/clone_creates__MTN_log/commit_log.lua
        tests/clone_creates_right__MTN_options/__driver__.lua
        tests/clone_validates_target_directory/__driver__.lua
        tests/clone_warning_with_multiple_heads/__driver__.lua
        tests/defecting_attributes/__driver__.lua
        tests/diff_restriction_renamed_parent/__driver__.lua
        tests/drop_root/__driver__.lua
        tests/fetching_nonexistent_entry_from_children_bug/__driver__.lua
        tests/importing_cvs_branches/cvs-repository/test/changelog,v
        tests/importing_cvs_branches/cvs-repository/test/file1,v
        tests/importing_cvs_branches/cvs-repository/test/file2,v
        tests/importing_cvs_branches/makerepo.sh
        
tests/importing_cvs_file_added_on_a_branch/cvs-repository/test/Attic/bar,v
        tests/importing_cvs_file_added_on_a_branch/cvs-repository/test/foo,v
        tests/importing_cvs_file_added_on_a_branch/makerepo.sh
        tests/importing_cvs_file_with_one_version/cvs-repository/test/foo,v
        tests/importing_cvs_file_with_one_version/makerepo.sh
        tests/importing_cvs_files/cvs-repository/test/foo,v
        tests/importing_cvs_files/makerepo.sh
        tests/importing_cvs_files_with_identical_logs/cvs-repository/test/foo,v
        tests/importing_cvs_files_with_identical_logs/makerepo.sh
        
tests/importing_cvs_with_vendor_imports_and_branches/cvs-repository/test/changelog,v
        
tests/importing_cvs_with_vendor_imports_and_branches/cvs-repository/test/file1,v
        
tests/importing_cvs_with_vendor_imports_and_branches/cvs-repository/test/file2,v
        tests/importing_cvs_with_vendor_imports_and_branches/makerepo.sh
        tests/invoke_subcommands/__driver__.lua
        tests/invoke_toplevel_group/__driver__.lua
        tests/key_files_created_securely/__driver__.lua
        tests/keydir_defaults_to_under_confdir/__driver__.lua
        tests/netsync_key_hook/__driver__.lua
        tests/netsync_key_hook/client-hooks.lua
        tests/netsync_key_hook/read-permissions
        tests/netsync_with_suspended_branch/__driver__.lua
        tests/pluck_directory_bug_1/__driver__.lua
        tests/pluck_directory_bug_2/__driver__.lua
        tests/rename_in_new_workspace/__driver__.lua
        tests/restricted_diff_bug/__driver__.lua
        tests/restricted_revert_bug/__driver__.lua
        
tests/schema_migration/7ca81b45279403419581d7fde31ed888a80bd34e.mtn.dumped
        
tests/schema_migration/fe48b0804e0048b87b4cea51b3ab338ba187bdc2.mtn.dumped
        tests/server_initiated_sync/__driver__.lua
        tests/server_initiated_sync/server1.rc
        tests/spawn_pipe/__driver__.lua tests/spawn_pipe/testhooks
        tests/ssh_agent/__driver__.lua tests/ssh_agent/id_dsa
        tests/ssh_agent/id_dsa.pub tests/ssh_agent/id_rsa
        tests/ssh_agent/id_rsa.pub tests/ssh_agent/id_rsa2
        tests/ssh_agent/id_rsa2.pub
        tests/status_with_attrs/__driver__.lua
        tests/suspend/__driver__.lua
        tests/test_a_merge_9/__driver__.lua
        tests/test_a_merge_9/left tests/test_a_merge_9/parent
        tests/test_a_merge_9/right
        tests/test_the_version_command/__driver__.lua
        tests/user_commands/__driver__.lua
        tests/user_commands/extra_rc unit-testsuite.lua
        unix/ssh_agent_platform.cc unix/ssh_agent_platform.hh
        unix/tester-plaf.cc vector.hh visualc/runtests.bat
        visualc/unit_tests.vcproj vocab_cast.hh vocab_hash.hh
        win32/monotone.bmp win32/ssh_agent_platform.cc
        win32/ssh_agent_platform.hh win32/tester-plaf.cc
        work_conflicts.hh
Added directories:
        mac tests/add_unknown_ignored tests/add_unknown_recursive
        tests/add_unknown_recursive_ignored tests/alias_command
        tests/annotate_accidental_clean_merge tests/automate_cert
        tests/automate_commands_are_not_completed
        tests/automate_db_set,get tests/automate_identify
        tests/automate_put_file tests/automate_put_revision
        tests/automate_put_revision_for_merge
        tests/automate_put_revision_unknown_file
        tests/automate_roots tests/automate_set_drop_attribute
        tests/clone_-b_no_dir tests/clone_creates__MTN_log
        tests/clone_creates_right__MTN_options
        tests/clone_validates_target_directory
        tests/clone_warning_with_multiple_heads
        tests/defecting_attributes
        tests/diff_restriction_renamed_parent tests/drop_root
        tests/fetching_nonexistent_entry_from_children_bug
        tests/importing_cvs_branches/cvs-repository
        tests/importing_cvs_branches/cvs-repository/test
        tests/importing_cvs_deleted_file/cvs-repository
        tests/importing_cvs_file_added_on_a_branch/cvs-repository
        tests/importing_cvs_file_added_on_a_branch/cvs-repository/test
        tests/importing_cvs_file_added_on_a_branch/cvs-repository/test/Attic
        tests/importing_cvs_file_dead_on_head_and_branch/cvs-repository
        tests/importing_cvs_file_dead_on_head_and_branch/cvs-repository/test
        tests/importing_cvs_file_with_one_version/cvs-repository
        tests/importing_cvs_file_with_one_version/cvs-repository/test
        tests/importing_cvs_files/cvs-repository
        tests/importing_cvs_files/cvs-repository/test
        tests/importing_cvs_files_with_identical_logs/cvs-repository
        tests/importing_cvs_files_with_identical_logs/cvs-repository/test
        tests/importing_cvs_problematic_repo/cvs-repository
        tests/importing_cvs_problematic_repo/cvs-repository/test
        tests/importing_cvs_with_vendor_imports_and_branches/cvs-repository
        tests/importing_cvs_with_vendor_imports_and_branches/cvs-repository/test
        tests/invoke_subcommands tests/invoke_toplevel_group
        tests/key_files_created_securely
        tests/keydir_defaults_to_under_confdir
        tests/netsync_key_hook tests/netsync_with_suspended_branch
        tests/pluck_directory_bug_1 tests/pluck_directory_bug_2
        tests/rename_in_new_workspace tests/restricted_diff_bug
        tests/restricted_revert_bug tests/server_initiated_sync
        tests/spawn_pipe tests/ssh_agent tests/status_with_attrs
        tests/suspend tests/test_a_merge_9
        tests/test_the_version_command tests/user_commands
Modified files:
        AUTHORS HACKING INSTALL Makefile.am NEWS README.changesets
        ROADMAP UPGRADE adler32.hh annotate.cc annotate.hh
        app_state.cc app_state.hh automate.cc basic_io.cc
        basic_io.hh botan/ber_dec.cpp botan/libstate.cpp
        botan/mem_pool.cpp botan/mem_pool.h cert.cc cert.hh
        charset.cc charset.hh cmd.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_othervcs.cc cmd_packet.cc
        cmd_ws_commit.cc commands.cc commands.hh configure.ac
        constants.cc constants.hh contrib/README
        contrib/ciabot_monotone_hookversion.py
        contrib/ext_hooks_expand.pl
        contrib/monotone-mirror-postaction-update.sh
        contrib/monotone-mirror.sh
        contrib/monotone-notify-hookversion.lua
        contrib/monotone-notify.pl contrib/monotone.bash_completion
        contrib/monotone.el contrib/monotone.zsh_completion
        contrib/mtbrowse.sh crypto_tests.cc cset.cc cset.hh
        cycle_detector.hh database.cc database.hh database_check.cc
        database_check.hh debian/changelog debian/control
        debian/copyright debian/monotone-server.postinst
        debian/monotone-server.postrm debian/po/fr.po debian/rules
        debian/watch diff_patch.cc diff_patch.hh do-editor-vars.sh
        enumerator.cc enumerator.hh epoch.cc epoch.hh file_io.cc
        file_io.hh globish.cc globish.hh graph.cc graph.hh
        hash_map.hh hmac.cc hmac.hh idna/idn-int.h idna/stringprep.h
        idna/toutf8.c inodeprint.cc interner.hh key_store.cc
        key_store.hh keys.cc keys.hh lcs.cc lcs.hh legacy.cc
        legacy.hh lua/lbaselib.cc lua/lcode.cc lua/ldebug.cc
        lua/lfunc.cc lua/loadlib.cc lua/loslib.cc lua/lparser.cc
        lua/lstrlib.cc lua/ltable.cc lua/lua.h lua/luaconf.h
        lua/lvm.cc lua-testsuite.lua lua.cc lua.hh lua_hooks.cc
        lua_hooks.hh luaext_globish.cc luaext_guess_binary.cc
        luaext_mkstemp.cc luaext_parse_basic_io.cc
        luaext_platform.cc m4/boost.m4 m4/sqlite.m4 merge.cc
        merge.hh merkle_tree.cc merkle_tree.hh mkstemp.cc mkstemp.hh
        monotone.cc monotone.spec monotone.texi mt_version.cc
        mt_version.hh mtn-sanity.cc netcmd.cc netcmd.hh netsync.cc
        netxx/probe_select.cxx netxx_pipe.cc netxx_pipe.hh
        notes/README.testing notes/release-checklist.txt
        numeric_vocab.cc numeric_vocab.hh option.cc option.hh
        options.cc options.hh options_list.hh outdated_indicator.cc
        packet.cc packet.hh parallel_iter.hh paths.cc paths.hh
        pch.hh platform-wrapped.hh platform.hh po/POTFILES.in
        po/README po/de.po po/es.po po/fr.po po/it.po po/ja.po
        po/pt_BR.po po/sv.po project.cc project.hh randomfile.hh
        randomizer.cc randomizer.hh rcs_file.cc rcs_file.hh
        rcs_import.cc refiner.cc refiner.hh restrictions.cc
        restrictions.hh rev_height.cc rev_height.hh revision.cc
        revision.hh roster.cc roster.hh roster_delta.cc
        roster_delta.hh roster_merge.cc roster_merge.hh safe_map.hh
        sanity.cc sanity.hh schema.sql schema_migration.cc
        schema_migration.hh selectors.cc selectors.hh sha1.cc
        sha1_engine.hh simplestring_xform.cc simplestring_xform.hh
        smap.hh sqlite/alter.c sqlite/analyze.c sqlite/attach.c
        sqlite/auth.c sqlite/btree.c sqlite/btree.h sqlite/build.c
        sqlite/callback.c sqlite/date.c sqlite/delete.c
        sqlite/expr.c sqlite/func.c sqlite/hash.c sqlite/insert.c
        sqlite/keywordhash.h sqlite/legacy.c sqlite/loadext.c
        sqlite/main.c sqlite/opcodes.c sqlite/opcodes.h sqlite/os.c
        sqlite/os.h sqlite/os_common.h sqlite/os_os2.c
        sqlite/os_unix.c sqlite/os_win.c sqlite/pager.c
        sqlite/pager.h sqlite/parse.c sqlite/parse.h sqlite/pragma.c
        sqlite/prepare.c sqlite/printf.c sqlite/select.c
        sqlite/sqlite3.h sqlite/sqlite3ext.h sqlite/sqliteInt.h
        sqlite/table.c sqlite/tokenize.c sqlite/trigger.c
        sqlite/update.c sqlite/utf.c sqlite/util.c sqlite/vacuum.c
        sqlite/vdbe.c sqlite/vdbe.h sqlite/vdbeInt.h
        sqlite/vdbeapi.c sqlite/vdbeaux.c sqlite/vdbefifo.c
        sqlite/vdbemem.c sqlite/vtab.c sqlite/where.c std_hooks.lua
        string_queue.cc string_queue.hh
        tester-tests/cleanup-1/__driver__.lua
        tester-tests/cleanup-2/__driver__.lua
        tester-tests/isolated-1/__driver__.lua tester-testsuite.lua
        tester.cc testlib.lua
        tests/(imp)_deleting_directories/__driver__.lua
        tests/(imp)_merge((patch_foo_a),_(delete_foo_))/__driver__.lua
        tests/(minor)_drop_in_subdir/__driver__.lua
        tests/(minor)_update_cleans_emptied_directories/__driver__.lua
        tests/_--author,_--date/__driver__.lua
        tests/_MTN_revision_is_required/__driver__.lua
        tests/annotate_file_whose_name_changed/__driver__.lua
        tests/automate_get_attributes/__driver__.lua
        tests/automate_get_corresponding_path/__driver__.lua
        tests/automate_inventory/__driver__.lua
        tests/changing_passphrase_of_a_private_key/__driver__.lua
        tests/check_that_--xargs_and_-(at)_behave_correctly/__driver__.lua
        tests/command_completion/__driver__.lua
        tests/common/netsync.lua
        tests/db_check_and_non-serious_errors/__driver__.lua
        tests/diff_against_empty_file/expected.diff
        tests/diff_shows_renames/__driver__.lua
        tests/diffing_a_file_within_revision_outside_a_workspace/__driver__.lua
        tests/disallowing_persistence_of_passphrase/__driver__.lua
        tests/drop_directory_with_unversioned_files_and_update/__driver__.lua
        tests/drop_missing_and_unknown_files/__driver__.lua
        tests/drop_removes_attributes/__driver__.lua
        tests/drop_with_actual_removal/__driver__.lua
        tests/empty_environment/__driver__.lua
        tests/empty_string_as_a_path_name/__driver__.lua
        tests/exchanging_work_via_netsync,_with_notes/testnotes.test
        tests/filenames_in_diff_after_rename/__driver__.lua
        tests/files_with_intermediate__MTN_path_elements/__driver__.lua
        tests/generating_and_extracting_keys_and_certs/__driver__.lua
        tests/import/__driver__.lua
        tests/importing_cvs_branches/__driver__.lua
        tests/importing_cvs_deleted_file/__driver__.lua
        tests/importing_cvs_file_added_on_a_branch/__driver__.lua
        tests/importing_cvs_file_dead_on_head_and_branch/__driver__.lua
        tests/importing_cvs_file_with_one_version/__driver__.lua
        tests/importing_cvs_files/__driver__.lua
        tests/importing_cvs_files_with_identical_logs/__driver__.lua
        tests/importing_cvs_problematic_repo/__driver__.lua
        tests/importing_cvs_small_real_repo/__driver__.lua
        tests/importing_cvs_tricky_repo_with_tags/__driver__.lua
        tests/importing_cvs_with_vendor_imports_and_branches/__driver__.lua
        tests/importing_files_with_non-english_names/__driver__.lua
        tests/invalid_--root_settings/__driver__.lua
        tests/key_management_without_a_database/__driver__.lua
        tests/list_missing_files/__driver__.lua
        tests/listing_changed_files/__driver__.lua
        tests/listing_workspace_manifests/__driver__.lua
        tests/log_--brief/__driver__.lua
        tests/log_--diffs/__driver__.lua
        tests/log_--last=N_--next=N/__driver__.lua
        tests/log_--last=N_FILENAME/__driver__.lua
        tests/log_--no-files_and_--merges/__driver__.lua
        tests/log_dir/__driver__.lua
        tests/log_hides_deleted_renamed_files/__driver__.lua
        tests/log_with_restriction/__driver__.lua
        tests/logging_a_file_within_revision_outside_a_workspace/__driver__.lua
        tests/manifest_restrictions/__driver__.lua
        tests/merge((),_(add_a,_drop_a,_add_a))/__driver__.lua
        tests/merge((),_(add_a,_patch_a,_drop_a,_add_a))/__driver__.lua
        tests/merge((),_(drop_a,_rename_b_a,_patch_a))/__driver__.lua
        tests/merge((),_(patch_a,_drop_a,_add_a))/__driver__.lua
        tests/merge((add_a),_(add_a,_drop_a,_add_a))/__driver__.lua
        tests/merge((drop_a),_(drop_a,_add_a))/__driver__.lua
        tests/merge((drop_a),_(rename_a_b,_patch_b))/__driver__.lua
        tests/merge((patch_a),_(drop_a,_add_a))/__driver__.lua
        tests/merge((patch_foo_a),_(rename_foo__bar_))/__driver__.lua
        tests/merge((rename_a_b),_(rename_a_c))/__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/__driver__.lua
        tests/merge_into_workspace_attr_corpse/expected-roster
        tests/merge_into_workspace_files_added/expected-revision
        tests/merge_rename_file_and_rename_dir/__driver__.lua
        tests/merge_with_add,_rename_file,_and_rename_dir/__driver__.lua
        tests/merging_(add_a)_with_(add_a,_drop_a)/__driver__.lua
        tests/merging_(add_a,_rename_a_b)_with_(add_b)/__driver__.lua
        tests/merging_a_rename_twice/__driver__.lua
        tests/netsync,--set-default/__driver__.lua
        tests/netsync_permissions_wildcards/__driver__.lua
        tests/netsync_verifies_server_keys/__driver__.lua
        tests/no-change_deltas_disappear/__driver__.lua
        tests/pivot_root/__driver__.lua
        tests/pivot_root_to_new_dir/__driver__.lua
        tests/pluck_basics/__driver__.lua
        tests/pluck_lifecycle/__driver__.lua
        tests/rename_cannot_overwrite_files/__driver__.lua
        tests/rename_dir_to_non-sibling/__driver__.lua
        tests/rename_file_to_dir/__driver__.lua
        tests/rename_files_into_a_directory/__driver__.lua
        tests/rename_in_subdir/__driver__.lua
        tests/rename_moves_attributes/__driver__.lua
        tests/rename_with_actual_file_rename/__driver__.lua
        tests/renaming_a_deleted_file/__driver__.lua
        tests/renaming_a_directory/__driver__.lua
        
tests/renaming_a_directory_and_then_adding_a_new_with_the_old_name/__driver__.lua
        tests/renaming_a_file/__driver__.lua
        tests/renaming_a_patched_file/__driver__.lua
        tests/renaming_and_editing_a_file/__driver__.lua
        tests/restricted_commands_are_consistent/__driver__.lua
        tests/restrictions_with_deletes/__driver__.lua
        tests/restrictions_with_renames_and_adds/__driver__.lua
        tests/revert_file_blocked_by_unversioned_directory/__driver__.lua
        tests/revert_file_to_base_revision/__driver__.lua
        tests/revert_moving_a_file_to_a_renamed_directory/__driver__.lua
        tests/revert_renames/__driver__.lua
        tests/revert_the_middle_of_a_sequence/__driver__.lua
        tests/reverting_a_pivot_root/__driver__.lua
        tests/schema_migration/__driver__.lua
        tests/schema_migration_bad_schema/possible.dump
        tests/schema_migration_error_recovery/__driver__.lua
        tests/schema_migration_with_rosterify/__driver__.lua
        tests/show_conflicts/__driver__.lua
        tests/single_character_filename_support/__driver__.lua
        tests/status/__driver__.lua
        tests/test_a_merge_8/__driver__.lua
        tests/test_a_merge_8/correct tests/test_a_merge_8/left
        tests/test_a_merge_8/parent tests/test_a_merge_8/right
        tests/test_annotate_command/__driver__.lua
        tests/test_the_help_command/__driver__.lua
        tests/two_parent_workspace_add_drop_rename/__driver__.lua
        tests/two_parent_workspace_commands_that_fail/__driver__.lua
        tests/two_parent_workspace_inodeprint_from_birth/__driver__.lua
        tests/two_parent_workspace_list/__driver__.lua
        tests/two_parent_workspace_pivot_root/__driver__.lua
        tests/update_with_blocked_rename/__driver__.lua
        tests/update_with_pending_drop/__driver__.lua
        tests/update_with_pending_rename/__driver__.lua
        tests/updating_through_a_pivot_root/__driver__.lua
        tests/usage_output_streams/__driver__.lua
        tests/workspace_migration/basic.lua
        tests/workspace_migration/inodeprints.lua
        tests/ws_ops_with_wrong_node_type/__driver__.lua
        transforms.cc transforms.hh txt2c.cc ui.cc ui.hh
        unit_tests.cc unit_tests.hh unix/cputime.cc unix/fs.cc
        unix/get_system_flavour.cc unix/inodeprint.cc unix/main.cc
        unix/make_io_binary.cc unix/os_strerror.cc unix/process.cc
        unix/read_password.cc unix/terminal.cc update.cc update.hh
        uri.cc uri.hh visualc/botan.vcproj visualc/config.h
        visualc/lua.vcproj visualc/monotone.sln
        visualc/monotone.vcproj visualc/netxx.vcproj
        visualc/sqlite3.vcproj visualc/tester.vcproj
        visualc/txt2c.vcproj vocab.cc vocab.hh vocab_macros.hh
        vocab_terms.hh win32/cputime.cc win32/fs.cc
        win32/get_system_flavour.cc win32/inodeprint.cc
        win32/main.cc win32/make_io_binary.cc win32/monotone.iss
        win32/os_strerror.cc win32/process.cc win32/read_password.cc
        win32/terminal.cc work.cc work.hh work_migration.cc
        xdelta.cc xdelta.hh
Modified attrs:
        contrib/monotone-mirror-postaction-push.sh
        contrib/recreate-manifest-tables.sh
        mac/monotone-pkg-logo.gif
        tests/importing_cvs_branches/makerepo.sh
        tests/importing_cvs_file_added_on_a_branch/makerepo.sh
        tests/importing_cvs_file_with_one_version/makerepo.sh
        tests/importing_cvs_files/makerepo.sh
        tests/importing_cvs_files_with_identical_logs/makerepo.sh
        tests/importing_cvs_with_vendor_imports_and_branches/makerepo.sh
        win32/monotone.bmp

ChangeLog: 

propagate from branch 'net.venge.monotone' (head 
05a0f9ce71013e8bc5c04c825a53d17a5e3007a9)
            to branch 'net.venge.monotone.workspace-merge.conflict1' (head 
55e9a3b0f89c309660f3c39877469fa1c56b6ec4)


monotone --db={your.database} diff 
--revision=05a0f9ce71013e8bc5c04c825a53d17a5e3007a9 
--revision=3011908f7f234e48e5d90160cb406f02f09c19d2
monotone --db={your.database} diff 
--revision=55e9a3b0f89c309660f3c39877469fa1c56b6ec4 
--revision=3011908f7f234e48e5d90160cb406f02f09c19d2
----------------------------------------------------------------------