#
#
# patch "NEWS"
#  from [93b544aac93014b1d06be2626e7be2bb03bcb724]
#    to [8b10963517d1dcec9d5224caa75508886243f63e]
# 
# patch "database.cc"
#  from [d9470b34e45072824d3c1e36d0b1ded8d342549f]
#    to [3a221934a73d25f35c980a3f857b1cadde18d70f]
# 
# patch "tests/warn_on_weird_branch_names/__driver__.lua"
#  from [28335819f62ef233f16b9eca53cc518addeefba0]
#    to [fa456ecf29cd782f13755ce5415815618aca9cfb]
#
============================================================
--- NEWS	93b544aac93014b1d06be2626e7be2bb03bcb724
+++ NEWS	8b10963517d1dcec9d5224caa75508886243f63e
@@ -64,7 +64,7 @@ Xxx Xxx 99 99:99:99 UTC 2010
 
         - The following characters have been deprecated in branch names
 
-                ?,*%+{}[]!^
+                ?,;*%+{}[]!^
 
           as they denote either meta characters in monotone's URI syntax
           or are used in globs to resolve branch patterns.
============================================================
--- database.cc	d9470b34e45072824d3c1e36d0b1ded8d342549f
+++ database.cc	3a221934a73d25f35c980a3f857b1cadde18d70f
@@ -3615,12 +3615,12 @@ database::put_revision_cert(cert const &
   if (cert.name() == "branch")
     {
       string branch_name = cert.value();
-      if (branch_name.find_first_of("?,*%%+{}[]!^") != string::npos ||
+      if (branch_name.find_first_of("?,;*%%+{}[]!^") != string::npos ||
           branch_name.find_first_of('-') == 0)
         {
           W(F("The branch name\n"
               "  '%s'\n"
-              "contains meta characters (one or more of '?,*%%+{}[]!^') or\n"
+              "contains meta characters (one or more of '?,;*%%+{}[]!^') or\n"
               "starts with a dash, which might cause malfunctions when used\n"
               "in a netsync branch pattern.\n\n"
               "If you want to undo this operation, please use the\n"
============================================================
--- tests/warn_on_weird_branch_names/__driver__.lua	28335819f62ef233f16b9eca53cc518addeefba0
+++ tests/warn_on_weird_branch_names/__driver__.lua	fa456ecf29cd782f13755ce5415815618aca9cfb
@@ -10,6 +10,8 @@ local branch_map = {
     ["com.project.release-1.0"] = 0,
     ["-com.project"]            = 1,
     ["com.project*"]            = 1,
+    ["com.{project1,project2}"] = 1,
+    ["com.project;project2"]    = 1,
     ["com.pr?ject"]             = 1,
     ["com.pr[o]j{e}ct"]         = 1,
     ["com.project-%20"]         = 1,