-----------------------------------------------------------------
Revision: 00bc6370f21302d2bd7f2008f4608d3a2d5683d0
Ancestor: 1a8afa25119c9c88dfd031c7fd834f6f99507ecf
Ancestor: 35effc3f4401de9c81ceaad77cf942ebddad0e07
Author: Timothy Brownawell <[email protected]>
Date: 1969-12-21T01:50:07
Branch: net.venge.monotone.tbrownaw.serve_automate
Added files:
automate_ostream.hh
tests/noop_merge_into_workspace/__driver__.lua
tests/serve-automate/__driver__.lua
Added directories:
tests/noop_merge_into_workspace tests/serve-automate
Modified files:
Makefile.am cmd.hh cmd_automate.cc cmd_db.cc cmd_merging.cc
cmd_netsync.cc gettext.h monotone.texi netcmd.hh netsync.cc
options_list.hh revision.cc roster.cc roster_merge.cc
tests/netsync_permissions/__driver__.lua
ChangeLog:
Merge in mainline changes.
monotone --db={your.database} diff
--revision=1a8afa25119c9c88dfd031c7fd834f6f99507ecf
--revision=00bc6370f21302d2bd7f2008f4608d3a2d5683d0
monotone --db={your.database} diff
--revision=35effc3f4401de9c81ceaad77cf942ebddad0e07
--revision=00bc6370f21302d2bd7f2008f4608d3a2d5683d0
----------------------------------------------------------------------
_______________________________________________
Monotone-commits-nodiffs mailing list
[email protected]
http://lists.nongnu.org/mailman/listinfo/monotone-commits-nodiffs
