[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Monotone-commits-nodiffs] Revision d8508502199c58a05df888eba986bac4d743
From: |
monotone |
Subject: |
[Monotone-commits-nodiffs] Revision d8508502199c58a05df888eba986bac4d743868c |
Date: |
Sun, 18 Oct 2009 16:54:16 +0200 |
-----------------------------------------------------------------
Revision: d8508502199c58a05df888eba986bac4d743868c
Ancestor: 647fce16342aedb7ae040200d44c6d44bd7e6947
Ancestor: acf8e10d859bf405563e0fd16853f235c9291519
Author: Timothy Brownawell <address@hidden>
Date: 2009-08-30T02:22:25
Branch: net.venge.monotone.tbrownaw.serve_automate
Added files:
automate_ostream.hh tests/db_fix_certs/__driver__.lua
tests/db_fix_certs/generate-db.sh
tests/db_fix_certs/other_key tests/db_fix_certs/test.mtn
tests/netsync_negotiation/__driver__.lua
tests/netsync_negotiation/netsync6.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
tests/resolve_conflicts_orphaned_file/__driver__.lua
tests/serve-automate/__driver__.lua
Added directories:
tests/db_fix_certs tests/netsync_negotiation
tests/resolve_conflicts_duplicate_name_directory
tests/resolve_conflicts_orphaned_file tests/serve-automate
Modified files:
Makefile.am NEWS automate.cc cert.cc cert.hh charset.cc
charset.hh cmd.hh cmd_automate.cc cmd_conflicts.cc cmd_db.cc
cmd_key_cert.cc cmd_list.cc cmd_netsync.cc configure.ac
constants.hh database.cc database.hh lua-testsuite.lua
merge_conflict.cc merge_content.cc merge_roster.cc
merge_roster.hh migrate_schema.cc monotone.texi netcmd.cc
netcmd.hh netsync.cc options.cc options_list.hh po/sv.po
project.cc project.hh
tests/generating_and_extracting_keys_and_certs/__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_content/conflicts-2
tests/resolve_conflicts_errors/__driver__.lua
tests/resolve_conflicts_read_all/missing-root_left
tests/resolve_conflicts_read_all/missing-root_right
tests/resolve_conflicts_read_all/orphaned-add_left
tests/resolve_conflicts_read_all/orphaned-add_right
tests/resolve_conflicts_read_all/orphaned-rename_left
tests/resolve_conflicts_read_all/orphaned-rename_right
tests/ssh_agent/__driver__.lua unit-tests/netcmd.cc
Modified attrs:
tests/db_fix_certs/generate-db.sh
tests/db_fix_certs/test.mtn
ChangeLog:
Merge in mainline changes.
monotone --db={your.database} diff
--revision=647fce16342aedb7ae040200d44c6d44bd7e6947
--revision=d8508502199c58a05df888eba986bac4d743868c
monotone --db={your.database} diff
--revision=acf8e10d859bf405563e0fd16853f235c9291519
--revision=d8508502199c58a05df888eba986bac4d743868c
----------------------------------------------------------------------
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Monotone-commits-nodiffs] Revision d8508502199c58a05df888eba986bac4d743868c,
monotone <=