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

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

[Monotone-commits-diffs] Revision ff3eb0cbfd45c6da3730ed3dc0c09a45b9d7c0


From: monotone
Subject: [Monotone-commits-diffs] Revision ff3eb0cbfd45c6da3730ed3dc0c09a45b9d7c084
Date: Sat, 29 Sep 2007 17:05:27 +0200

-----------------------------------------------------------------
Revision: ff3eb0cbfd45c6da3730ed3dc0c09a45b9d7c084
Ancestor: 61b5f6d88594f6d36d7093f03a3b9a38c0b6fb45
Ancestor: d4aec8d3ac1a254600a41544918824fedb8dcb23
Author: address@hidden
Date: 2007-09-25T13:51:22
Branch: net.venge.monotone.workspace-conflicts

Deleted entries:
        tests/db_kill_rev_locally_command_2
        tests/db_kill_rev_locally_command_2/__driver__.lua
Renamed entries:
        tests/automate_inventory/inventory_hooks.lua to 
tests/inventory_hooks.lua
        tests/db_kill_rev_and_recommit to tests/db_kill_rev_locally_and_recommit
        tests/db_kill_rev_locally_command to tests/db_kill_rev_locally
Added files:
        tests/automate_inventory_restricted/__driver__.lua
        tests/common/test_utils_inventory.lua
        tests/db_kill_rev_locally_workspace/__driver__.lua
        work_conflicts.hh
Added directories:
        tests/automate_inventory_restricted
        tests/db_kill_rev_locally_workspace
Modified files:
        NEWS automate.cc base.hh cmd_automate.cc cmd_db.cc
        cmd_diff_log.cc cmd_files.cc cmd_list.cc cmd_merging.cc
        cmd_netsync.cc cmd_ws_commit.cc contrib/extra-commands.lua
        contrib/monotone.bash_completion database.cc inodeprint.hh
        lua-testsuite.lua merge.cc monotone.texi notes/testsuite.txt
        options_list.hh po/de.po po/es.po po/it.po po/sv.po
        project.cc project.hh roster.cc roster.hh roster_merge.cc
        roster_merge.hh std_hooks.lua tester.cc testlib.lua
        tests/alias_command/__driver__.lua
        tests/annotate_accidental_clean_merge/__driver__.lua
        tests/annotate_file_whose_name_changed/__driver__.lua
        tests/annotate_where_line_splits/__driver__.lua
        tests/annotate_where_lineage_depends_on_traversal/__driver__.lua
        tests/annotate_where_one_parent_is_full_copy/__driver__.lua
        tests/automate_inventory/__driver__.lua
        tests/checkout_validates_target_directory/__driver__.lua
        tests/clone_validates_target_directory/__driver__.lua
        tests/db_kill_rev_locally/__driver__.lua
        tests/db_kill_rev_locally_and_recommit/__driver__.lua
        tests/inodeprints/__driver__.lua
        tests/netsync_permissions/__driver__.lua
        tests/spawn_redirected_hook_helper/__driver__.lua
        tests/test_annotate_command/__driver__.lua ui.hh
        win32/ssh_agent_platform.cc win32/ssh_agent_platform.hh
        work.cc work.hh

ChangeLog: 

propagate from branch 'net.venge.monotone.work-rev-refactor' (head 
d4aec8d3ac1a254600a41544918824fedb8dcb23)
            to branch 'net.venge.monotone.workspace-conflicts' (head 
61b5f6d88594f6d36d7093f03a3b9a38c0b6fb45)


monotone --db={your.database} diff 
--revision=61b5f6d88594f6d36d7093f03a3b9a38c0b6fb45 
--revision=ff3eb0cbfd45c6da3730ed3dc0c09a45b9d7c084
monotone --db={your.database} diff 
--revision=d4aec8d3ac1a254600a41544918824fedb8dcb23 
--revision=ff3eb0cbfd45c6da3730ed3dc0c09a45b9d7c084
----------------------------------------------------------------------




reply via email to

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