[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Monotone-commits-nodiffs] Revision 95c3202de51d4e25eef4cd45ea43eea12d8f
From: |
monotone |
Subject: |
[Monotone-commits-nodiffs] Revision 95c3202de51d4e25eef4cd45ea43eea12d8f2fab |
Date: |
Mon, 9 Jun 2008 00:33:47 +0200 |
-----------------------------------------------------------------
Revision: 95c3202de51d4e25eef4cd45ea43eea12d8f2fab
Ancestor: 1e32aef47a0aac336c73305f1637b99d7ac1edca
Ancestor: 220e18d590769a1a39d2842bc03bca60a2fa1e25
Author: address@hidden
Date: 2008-05-30T16:34:56
Branch: net.venge.monotone.automate-netsync
Renamed entries:
contrib/mtnopt to util/mtnopt
tests/clone_-b_no_dir to tests/clone_branch_no_dir
Added files:
contrib/monotone-inotify.lua
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/merge_with_conflicting_name_and_renamed_dir/expected.stdout
tests/resolve_duplicate_name_conflict/__driver__.lua
tests/util_mtnopt/__driver__.lua
Added directories:
tests/automate_get_options tests/automate_get_workspace_root
tests/automate_show_conflicts
tests/automate_show_conflicts_defaults
tests/resolve_duplicate_name_conflict tests/util_mtnopt util
Modified files:
HACKING Makefile.am NEWS asciik.cc automate.cc basic_io.cc
basic_io.hh cmd_automate.cc cmd_files.cc cmd_merging.cc
cmd_netsync.cc contrib/monotone.bash_completion database.cc
diff_patch.cc diff_patch.hh examples/display_branches.lua
key_store.cc key_store.hh lru_writeback_cache.hh
lua-testsuite.lua luaext_parse_basic_io.cc merge.cc
monotone.texi netsync.cc options_list.hh paths.cc po/de.po
po/es.po po/sv.po roster.cc roster_merge.cc roster_merge.hh
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/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/test_utils_inventory.lua
tests/conflict_messages/__driver__.lua
tests/merge_with_conflicting_name_and_renamed_dir/__driver__.lua
work.cc
ChangeLog:
propagate from branch 'net.venge.monotone.automate_out_of_band' (head
1e32aef47a0aac336c73305f1637b99d7ac1edca)
to branch 'net.venge.monotone.automate-netsync' (head
220e18d590769a1a39d2842bc03bca60a2fa1e25)
monotone --db={your.database} diff
--revision=1e32aef47a0aac336c73305f1637b99d7ac1edca
--revision=95c3202de51d4e25eef4cd45ea43eea12d8f2fab
monotone --db={your.database} diff
--revision=220e18d590769a1a39d2842bc03bca60a2fa1e25
--revision=95c3202de51d4e25eef4cd45ea43eea12d8f2fab
----------------------------------------------------------------------
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Monotone-commits-nodiffs] Revision 95c3202de51d4e25eef4cd45ea43eea12d8f2fab,
monotone <=