# HG changeset patch
# User Matt Mackall <mpm@selenic.com>
# Date 1404927012 18000
# Node ID 3b97a93dc1374b6e660eedce86252fce016a2fae
# Parent  a3306b8cdc0f52528c265da5a724418ca163260d# Parent  92666a869ea4e39d31b836831ef9f7abdf72bc1a
merge with stable

diff -r a3306b8cdc0f -r 3b97a93dc137 hgext/bugzilla.py
--- a/hgext/bugzilla.py	Tue Jul 08 22:57:54 2014 -0400
+++ b/hgext/bugzilla.py	Wed Jul 09 12:30:12 2014 -0500
@@ -232,7 +232,7 @@
     bzurl=http://my-project.org/bugzilla
     user=bugmail@my-project.org
     password=plugh
-    version=xmlrpc
+    version=xmlrpc+email
     bzemail=bugzilla@my-project.org
     template=Changeset {node|short} in {root|basename}.
              {hgweb}/{webroot}/rev/{node|short}\\n
diff -r a3306b8cdc0f -r 3b97a93dc137 mercurial/bookmarks.py
--- a/mercurial/bookmarks.py	Tue Jul 08 22:57:54 2014 -0400
+++ b/mercurial/bookmarks.py	Wed Jul 09 12:30:12 2014 -0500
@@ -164,6 +164,9 @@
     marks = repo._bookmarks
     divergent = [b for b in marks if b.split('@', 1)[0] == bm.split('@', 1)[0]]
     for mark in divergent:
+        if mark == '@' or '@' not in mark:
+            # can't be divergent by definition
+            continue
         if mark and marks[mark] in deletefrom:
             if mark != bm:
                 del marks[mark]