--- 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
--- 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]