monotone-commits-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Monotone-commits-diffs] Revision 28d0bc41725a9e7d3001bef24d4e00a10ed01c


From: monotone
Subject: [Monotone-commits-diffs] Revision 28d0bc41725a9e7d3001bef24d4e00a10ed01cb7
Date: Wed, 28 May 2008 13:10:41 +0200

-----------------------------------------------------------------
Revision: 28d0bc41725a9e7d3001bef24d4e00a10ed01cb7
Ancestor: 59ef82632cb7f39b920ef794d6a0b119850c035e
Ancestor: dbb71451e03e8d0fc6fc7aeeebceb8b7e0d8fe1e
Author: Timothy Brownawell  <address@hidden>
Date: 2008-05-27T23:56:02
Branch: net.venge.monotone.tbrownaw.policy-branches

Deleted entries:
        debian/monotone-server.examples
Renamed entries:
        tests/clone_-b_no_dir to tests/clone_branch_no_dir
Added files:
        cmd_policy.cc contrib/dump-test-logs.sh
        contrib/monotone-inotify.lua cygwin/monotone-0.40-1.cygport
        cygwin/monotone-0.40-1.cygwin.patch
        debian/monotone-doc.doc-base policy.cc policy.hh
        tests/automate_get_options/__driver__.lua
        tests/automate_get_workspace_root/__driver__.lua
        tests/automate_inventory_ignore_dirs/expected_2.stderr
        tests/automate_inventory_ignore_dirs/expected_2.stdout
        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/checkout_in_windows_root/__driver__.lua
        tests/exchanging_work_via_netsync_sent_notes/__driver__.lua
        tests/exchanging_work_via_netsync_sent_notes/testnotes.test
        tests/exchanging_work_via_netsync_sent_notes/testnotes2.test
        tests/i_selector/__driver__.lua
        tests/merge_with_conflicting_name_and_renamed_dir/expected.stdout
        tests/netsync_stops_on_key_id_clash/__driver__.lua
        tests/policy-basic/__driver__.lua
        tests/policy-subpolicies/__driver__.lua
        tests/resolve_duplicate_name_conflict/__driver__.lua
        tests/util_mtnopt/__driver__.lua
        tests/wrong_options_override_workspace_options/__driver__.lua
        unix/tester-check-net.c util/mtnopt win32/tester-check-net.c
Added directories:
        cygwin tests/automate_get_options
        tests/automate_get_workspace_root
        tests/automate_show_conflicts
        tests/automate_show_conflicts_defaults
        tests/checkout_in_windows_root
        tests/exchanging_work_via_netsync_sent_notes
        tests/i_selector tests/netsync_stops_on_key_id_clash
        tests/policy-basic tests/policy-subpolicies
        tests/resolve_duplicate_name_conflict tests/util_mtnopt
        tests/wrong_options_override_workspace_options util
Modified files:
        .mtn-ignore HACKING Makefile.am NEWS annotate.cc annotate.hh
        asciik.cc automate.cc basic_io.cc basic_io.hh cert.cc
        cert.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_ws_commit.cc commands.cc
        contrib/monotone.bash_completion database.cc database.hh
        debian/changelog debian/control debian/copyright
        debian/monotone-doc.dirs debian/monotone-doc.docs
        debian/monotone-server.dirs debian/rules diff_patch.cc
        diff_patch.hh enumerator.cc enumerator.hh epoch.cc epoch.hh
        examples/display_branches.lua key_store.cc
        lru_writeback_cache.hh lua-testsuite.lua lua_hooks.cc
        lua_hooks.hh luaext_parse_basic_io.cc luaext_platform.cc
        merge.cc monotone.texi netcmd.hh netsync.cc options_list.hh
        paths.cc po/de.po po/es.po po/it.po po/sv.po project.cc
        project.hh rcs_import.cc refiner.cc revision.cc roster.cc
        roster_merge.cc roster_merge.hh selectors.cc selectors.hh
        ssh_agent.cc ssh_agent.hh std_hooks.lua tester.cc
        tests/automate_cert/__driver__.lua
        tests/automate_heads/__driver__.lua
        tests/automate_identify/__driver__.lua
        tests/automate_inventory/__driver__.lua
        tests/automate_inventory_ignore_dirs/__driver__.lua
        tests/automate_inventory_ignore_dirs/expected.stderr
        tests/automate_inventory_ignore_dirs/local_hooks.lua
        tests/automate_inventory_options/__driver__.lua
        tests/automate_inventory_options/expected-no-ignored.stdout
        tests/automate_inventory_options/expected-no-unchanged.stdout
        tests/automate_inventory_options/expected-no-unknown.stdout
        tests/automate_inventory_options/expected-none.stdout
        tests/automate_inventory_options/expected-renames-both.stdout
        
tests/automate_inventory_options/expected-renames-target-no-ignored.stdout
        
tests/automate_inventory_options/expected-renames-target-no-unknown.stdout
        tests/automate_inventory_options/expected-renames-target.stdout
        tests/automate_inventory_restricted/__driver__.lua
        tests/automate_keys/__driver__.lua
        tests/checkout_validates_target_directory/__driver__.lua
        tests/clone_branch_no_dir/__driver__.lua
        tests/clone_creates__MTN_log/__driver__.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/common/netsync-hooks_with_notes.lua
        tests/common/netsync.lua tests/common/selectors.lua
        tests/common/test_utils_inventory.lua
        tests/conflict_messages/__driver__.lua
        tests/merge_with_conflicting_name_and_renamed_dir/__driver__.lua
        tests/non_workspace_keydir/__driver__.lua
        tests/ssh_agent/__driver__.lua update.cc update.hh
        vocab_terms.hh win32/fs.cc work.cc
Modified attrs:
        util/mtnopt

ChangeLog: 

propagate from branch 'net.venge.monotone' (head 
dbb71451e03e8d0fc6fc7aeeebceb8b7e0d8fe1e)
            to branch 'net.venge.monotone.tbrownaw.policy-branches' (head 
59ef82632cb7f39b920ef794d6a0b119850c035e)


monotone --db={your.database} diff 
--revision=59ef82632cb7f39b920ef794d6a0b119850c035e 
--revision=28d0bc41725a9e7d3001bef24d4e00a10ed01cb7
monotone --db={your.database} diff 
--revision=dbb71451e03e8d0fc6fc7aeeebceb8b7e0d8fe1e 
--revision=28d0bc41725a9e7d3001bef24d4e00a10ed01cb7
----------------------------------------------------------------------




reply via email to

[Prev in Thread] Current Thread [Next in Thread]