[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Monotone-commits-diffs] Revision b16e3fc89ac2bc98cf6c3743e8090db81b733b
From: |
monotone |
Subject: |
[Monotone-commits-diffs] Revision b16e3fc89ac2bc98cf6c3743e8090db81b733b1b |
Date: |
Sat, 29 Aug 2009 16:19:55 +0200 |
-----------------------------------------------------------------
Revision: b16e3fc89ac2bc98cf6c3743e8090db81b733b1b
Ancestor: c474760e191060309a96fadaa7865ecf6bed5b8c
Ancestor: d927e7e63d3181b407ff3440f682aa0e230a6052
Author: address@hidden
Date: 2009-08-29T14:14:28
Branch: net.venge.monotone
Deleted entries:
tests/netsync_stops_on_key_id_clash
tests/netsync_stops_on_key_id_clash/__driver__.lua
Added files:
tests/duplicate_key_id/local_name.lua
tests/resolve_conflicts_all_resolutions/show_first-gui_left
tests/resolve_conflicts_all_resolutions/show_first-gui_right
tests/resolve_conflicts_all_resolutions/show_remaining-gui_left
tests/resolve_conflicts_duplicate_name_directory/__driver__.lua
Added directories:
tests/resolve_conflicts_duplicate_name_directory
Modified files:
Makefile.am NEWS annotate.cc automate.cc base.hh cert.cc
cert.hh charset.cc charset.hh cmd_conflicts.cc cmd_db.cc
cmd_key_cert.cc cmd_list.cc cmd_merging.cc cmd_netsync.cc
cmd_othervcs.cc cmd_packet.cc cmd_ws_commit.cc configure.ac
constants.hh database.cc database.hh database_check.cc
git_export.cc key_store.cc key_store.hh keys.cc keys.hh
lua-testsuite.lua lua_hooks.cc lua_hooks.hh
merge_conflict.cc merge_roster.cc merge_roster.hh
migrate_ancestry.cc migrate_schema.cc migration.hh
monotone.texi netcmd.cc netcmd.hh netsync.cc options_list.hh
packet.cc packet.hh po/sv.po project.cc project.hh sanity.cc
schema.sql std_hooks.lua testlib.lua
tests/automate_cert/expected tests/automate_certs/expected
tests/automate_inventory_options/test_hooks.lua
tests/automate_keys/__driver__.lua
tests/changing_passphrase_of_a_private_key/__driver__.lua
tests/commit_default_editor/test_hooks.lua
tests/common/netsync-hooks_with_notes.lua
tests/creating_a_bad_criss-cross_merge/alice.lua
tests/creating_a_bad_criss-cross_merge/bob.lua
tests/database_check/__driver__.lua
tests/db_check_and_non-serious_errors/__driver__.lua
tests/do_not_log_the_result_of_hook_get_passphrase/hook.lua
tests/drop_a_public_and_private_key/__driver__.lua
tests/drop_a_public_key/__driver__.lua
tests/duplicate_key_id/__driver__.lua
tests/generating_and_extracting_keys_and_certs/__driver__.lua
tests/importing_cvs_tricky_repo_with_tags/test.tags
tests/key_files_created_securely/__driver__.lua
tests/min_hooks.lua
tests/netsync_duplicate_keys/__driver__.lua
tests/netsync_permissions/__driver__.lua
tests/read_and_convert_old_privkey_packet/__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/show_first-checkout_left
tests/resolve_conflicts_all_resolutions/show_first-checkout_right
tests/resolve_conflicts_all_resolutions/show_first-thermostat
tests/resolve_conflicts_all_resolutions/show_remaining-checkout_left
tests/resolve_conflicts_errors/__driver__.lua
tests/resolve_conflicts_orphaned_file/__driver__.lua
tests/ssh_agent/__driver__.lua tests/test_hooks.lua
tests/trust_hooks_and_trusted_command/__driver__.lua
unit-tests/netcmd.cc unit-tests/packet.cc unit-tests/uri.cc
update.cc uri.cc uri.hh vocab.cc vocab_terms.hh work.cc
ChangeLog:
propagate from branch 'net.venge.monotone.stephe' (head
d927e7e63d3181b407ff3440f682aa0e230a6052)
to branch 'net.venge.monotone' (head
c474760e191060309a96fadaa7865ecf6bed5b8c)
monotone --db={your.database} diff
--revision=c474760e191060309a96fadaa7865ecf6bed5b8c
--revision=b16e3fc89ac2bc98cf6c3743e8090db81b733b1b
monotone --db={your.database} diff
--revision=d927e7e63d3181b407ff3440f682aa0e230a6052
--revision=b16e3fc89ac2bc98cf6c3743e8090db81b733b1b
----------------------------------------------------------------------
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Monotone-commits-diffs] Revision b16e3fc89ac2bc98cf6c3743e8090db81b733b1b,
monotone <=