Submitter | phabricator |
---|---|
Date | May 14, 2020, 3 p.m. |
Message ID | <differential-rev-PHID-DREV-q2gty7rf4bwfpagxf4iw-req@mercurial-scm.org> |
Download | mbox | patch |
Permalink | /patch/46310/ |
State | Superseded |
Headers | show |
Comments
Patch
diff --git a/mercurial/bookmarks.py b/mercurial/bookmarks.py --- a/mercurial/bookmarks.py +++ b/mercurial/bookmarks.py @@ -754,7 +754,8 @@ if changed: tr = trfunc() changes = [] - for b, node, writer, msg in sorted(changed): + key = lambda t: (t[0], t[1] or b'') + for b, node, writer, msg in sorted(changed, key=key): changes.append((b, node)) writer(msg) localmarks.applychanges(repo, tr, changes)