Mercurial > public > mercurial-scm > hg-stable

diff mercurial/shelve.py @ 44186:69b091cdc506 stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
shelve: fix ordering of merge labels Differential Revision: https://phab.mercurial-scm.org/D8140
author Kyle Lippincott <spectral@google.com>
date Thu, 20 Feb 2020 16:21:00 -0800
parents 414cb20e241e
children f5c006621f07
line wrap: on
line diff
--- a/mercurial/shelve.py	Thu Feb 20 17:06:01 2020 -0800
+++ b/mercurial/shelve.py	Thu Feb 20 16:21:00 2020 -0800
@@ -997,7 +997,7 @@
             repo,
             shelvectx,
             shelvectx.p1(),
-            labels=[b'shelve', b'working-copy'],
+            labels=[b'working-copy', b'shelve'],
             keepconflictparent=True,
         )
         if stats.unresolvedcount: