Mercurial > public > mercurial-scm > hg-stable

diff hgext/shelve.py @ 38619:9b077e5fa8ba

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
shelve: use more accurate description in conflict marker We use "shelve" and "working-copy" instead of "source" and "dest". This is a net win. Differential Revision: https://phab.mercurial-scm.org/D3694
author Boris Feld <boris.feld@octobus.net>
date Tue, 05 Jun 2018 12:04:15 +0200
parents c829749e7639
children abcf500d527c
line wrap: on
line diff
--- a/hgext/shelve.py	Tue May 29 00:30:50 2018 +0200
+++ b/hgext/shelve.py	Tue Jun 05 12:04:15 2018 +0200
@@ -772,7 +772,7 @@
     with repo.ui.configoverride(overrides, 'unshelve'):
         ui.status(_('rebasing shelved changes\n'))
         stats = merge.graft(repo, shelvectx, shelvectx.p1(),
-                           labels=['dest', 'source'],
+                           labels=['shelve', 'working-copy'],
                            keepconflictparent=True)
         if stats.unresolvedcount:
             tr.close()