-----------------------------------------------------------------
Revision: 1a50d519cbff1a7c76754ae33c44c52f4837b806
Ancestor: 043333cc4ad846fd70d50d49a230862f10ca1487
Ancestor: 4ac132aed7e817529fc9a281a519a3964ad13c64
Author: [email protected]
Date: 07/07/10 11:44:00
Branch: net.venge.monotone
Added files:
tests/annotate_ignores_untrusted_certs/__driver__.lua
tests/annotate_ignores_untrusted_certs/all_untrusted.lua
tests/annotate_ignores_untrusted_certs/author_untrusted.lua
tests/annotate_ignores_untrusted_certs/date_untrusted.lua
tests/disapproving_of_a_merge_revision/__driver__.lua
tests/disapproving_of_a_merge_revision/badfile
tests/disapproving_of_a_merge_revision/badfile2
tests/disapproving_of_a_merge_revision/goodfile
tests/disapproving_of_a_merge_revision/rootfile
tests/disapproving_of_a_revision_range/__driver__.lua
tests/disapproving_of_a_revision_range/badfile
tests/disapproving_of_a_revision_range/badfile2
tests/disapproving_of_a_revision_range/finalfile
tests/disapproving_of_a_revision_range/goodfile
tests/disapproving_of_a_revision_range/rootfile
tests/disapproving_of_a_revision_range/updatefile
tests/disapproving_of_bad_revision_range/__driver__.lua
tests/rename_warns_on_subdir_move/__driver__.lua
tests/trust_hooks_and_trusted_command/hooks.lua
Added directories:
tests/annotate_ignores_untrusted_certs
tests/disapproving_of_a_merge_revision
tests/disapproving_of_a_revision_range
tests/disapproving_of_bad_revision_range
tests/rename_warns_on_subdir_move
Modified files:
INSTALL NEWS annotate.cc automate.cc cmd_key_cert.cc
cmd_ws_commit.cc contrib/mtn_makepermissions
merge_conflict.cc monotone.texi network/connection_info.cc
notes/release-checklist.txt paths.cc paths.hh po/it.po
selectors.cc selectors.hh tests/import/__driver__.lua
tests/test_hooks.lua
tests/trust_hooks_and_trusted_command/__driver__.lua work.cc
ChangeLog:
merge of '043333cc4ad846fd70d50d49a230862f10ca1487'
and '4ac132aed7e817529fc9a281a519a3964ad13c64'
monotone --db={your.database} diff
--revision=043333cc4ad846fd70d50d49a230862f10ca1487
--revision=1a50d519cbff1a7c76754ae33c44c52f4837b806
monotone --db={your.database} diff
--revision=4ac132aed7e817529fc9a281a519a3964ad13c64
--revision=1a50d519cbff1a7c76754ae33c44c52f4837b806
----------------------------------------------------------------------
_______________________________________________
Monotone-commits-nodiffs mailing list
[email protected]
http://lists.nongnu.org/mailman/listinfo/monotone-commits-nodiffs
