Submitter | phabricator |
---|---|
Date | Feb. 15, 2020, 9:05 p.m. |
Message ID | <differential-rev-PHID-DREV-d4nrvgzvoyfgp72w6xtp-req@mercurial-scm.org> |
Download | mbox | patch |
Permalink | /patch/45262/ |
State | Superseded |
Headers | show |
Comments
Patch
diff --git a/relnotes/next b/relnotes/next --- a/relnotes/next +++ b/relnotes/next @@ -18,6 +18,7 @@ == Bug Fixes == + * Fix server exception when concurrent pushes delete the same bookmark == Backwards Compatibility Changes == diff --git a/mercurial/bookmarks.py b/mercurial/bookmarks.py --- a/mercurial/bookmarks.py +++ b/mercurial/bookmarks.py @@ -173,6 +173,8 @@ nrefs.sort() def _del(self, mark): + if mark not in self._refmap: + return self._clean = False node = self._refmap.pop(mark) nrefs = self._nodemap[node]