#
#
# patch "NEWS"
#  from [93b544aac93014b1d06be2626e7be2bb03bcb724]
#    to [fb25e1495542698d6635da44b21806184f72ad17]
# 
# patch "monotone.texi"
#  from [b8af75f3cda3b4abf12590536ef63ae6b3314fdc]
#    to [0613546310d5627ac20feb0fcbecc27d63bf2f6e]
# 
# patch "network/connection_info.cc"
#  from [42e4520e9efbacda6b7dd97ccb3a513ce48c3938]
#    to [e32475c5f2afe6fb2d9daa6337200c07afb94534]
# 
# patch "tests/netsync_mtn_uri_scheme/__driver__.lua"
#  from [6585d3b4e7568e664e3529f90937005e72dd685d]
#    to [9f5c11012b07ee40e31a80c9e17942a99a5ebd03]
#
============================================================
--- NEWS	93b544aac93014b1d06be2626e7be2bb03bcb724
+++ NEWS	fb25e1495542698d6635da44b21806184f72ad17
@@ -29,7 +29,11 @@ Xxx Xxx 99 99:99:99 UTC 2010
 
           The possibility to specify include patterns by using
           'include=' and exclude patterns by using 'exclude='
-          in the query string has been removed.
+          in the query string has been removed. Patterns are separated
+          by ';' and will be treated as include patterns unless prefixed
+          with '-'. Where you could previously specify
+          "mtn://host/?include=foo,exclude=bar", you would now give
+          "mtn://host/?foo;-bar" instead.
 
           Monotone's native protocol (mtn://) is still the default
           protocol if nothing is specified.
============================================================
--- monotone.texi	b8af75f3cda3b4abf12590536ef63ae6b3314fdc
+++ monotone.texi	0613546310d5627ac20feb0fcbecc27d63bf2f6e
@@ -5724,7 +5724,7 @@ @section Network
 
 @smallexample
 @group
-<scheme>://[[<user>@@]<host>[:<port>]][/<path>][?<pattern>[,-<exclude-pattern>[...]]]
+<scheme>://[[<user>@@]<host>[:<port>]][/<path>][?<pattern>[;-<exclude-pattern>[...]]]
 @end group
 @end smallexample
 
@@ -5733,7 +5733,7 @@ @section Network
 @smallexample
 @group
 mtn://my.server:4690?my.branch
-mtn://my.server/project?my.other.branch*,-my.other.branch.test
+mtn://my.server/project?my.other.branch*;-my.other.branch.test
 file:///path/to/database.mtn?my.branch
 ssh://joe@@my.server/~/db.mtn?joes.branch
 @end group
============================================================
--- tests/netsync_mtn_uri_scheme/__driver__.lua	6585d3b4e7568e664e3529f90937005e72dd685d
+++ tests/netsync_mtn_uri_scheme/__driver__.lua	9f5c11012b07ee40e31a80c9e17942a99a5ebd03
@@ -16,7 +16,7 @@ srv = netsync.start()
 srv = netsync.start()
 
 -- %61 = 'a'
-check(mtn2("pull", srv.url .. "?br%61nch-te*,-br%61nch-test-*"), 0, false, false)
+check(mtn2("pull", srv.url .. "?br%61nch-te*;-br%61nch-test-*"), 0, false, false)
 check(mtn2("ls", "branches"), 0, true)
 check(not qgrep("^branch$", "stdout"))
 check(    qgrep("^branch-test$", "stdout"))
============================================================
--- network/connection_info.cc	42e4520e9efbacda6b7dd97ccb3a513ce48c3938
+++ network/connection_info.cc	e32475c5f2afe6fb2d9daa6337200c07afb94534
@@ -324,7 +324,7 @@ netsync_connection_info::parse_includes_
   includes.clear();
   excludes.clear();
 
-  char const separator = ',';
+  char const separator = ';';
   char const negate = '-';
 
   string::size_type begin = 0;