#
#
# patch "network/connection_info.cc"
#  from [e32475c5f2afe6fb2d9daa6337200c07afb94534]
#    to [ca442d99d973be6e4b5d6cecdd986b419896c389]
# 
# patch "tests/netsync_mtn_uri_scheme/__driver__.lua"
#  from [9f5c11012b07ee40e31a80c9e17942a99a5ebd03]
#    to [6c2d5b2b6f84cba96308f502a38a895a9e99a7c7]
#
============================================================
--- tests/netsync_mtn_uri_scheme/__driver__.lua	9f5c11012b07ee40e31a80c9e17942a99a5ebd03
+++ tests/netsync_mtn_uri_scheme/__driver__.lua	6c2d5b2b6f84cba96308f502a38a895a9e99a7c7
@@ -15,6 +15,8 @@ srv = netsync.start()
 
 srv = netsync.start()
 
+check(mtn2("pull", srv.url .. "?foo", "bar"), 1, false, false)
+
 -- %61 = 'a'
 check(mtn2("pull", srv.url .. "?br%61nch-te*;-br%61nch-test-*"), 0, false, false)
 check(mtn2("ls", "branches"), 0, true)
============================================================
--- network/connection_info.cc	e32475c5f2afe6fb2d9daa6337200c07afb94534
+++ network/connection_info.cc	ca442d99d973be6e4b5d6cecdd986b419896c389
@@ -462,6 +462,8 @@ netsync_connection_info::setup_from_serv
   info->client.conn_type = type;
 
   info->client.set_raw_uri(host());
+  E(info->client.uri.query.empty(), origin::user,
+    F("you can specify either a query string or separate include/exclude parameters, but not both"));
   info->client.set_include_exclude_pattern(includes, excludes);
 
   info->client.ensure_completeness();