Mercurial > hg
changeset 38619:9b077e5fa8ba
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 | 875e033fbbdd |
| files | hgext/shelve.py tests/test-shelve.t |
| diffstat | 2 files changed, 7 insertions(+), 7 deletions(-) [+] |
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()
--- a/tests/test-shelve.t Tue May 29 00:30:50 2018 +0200 +++ b/tests/test-shelve.t Tue Jun 05 12:04:15 2018 +0200 @@ -376,11 +376,11 @@ +++ b/a/a @@ -1,2 +1,6 @@ a - +<<<<<<< dest: * - shelve: pending changes temporary commit (glob) + +<<<<<<< shelve: 562f7831e574 - shelve: pending changes temporary commit c +======= +a - +>>>>>>> source: 32c69314e062 - shelve: changes to: [mq]: second.patch + +>>>>>>> working-copy: 32c69314e062 - shelve: changes to: [mq]: second.patch diff --git a/b/b b/b.rename/b rename from b/b rename to b.rename/b @@ -798,11 +798,11 @@ M f ? f.orig $ cat f - <<<<<<< dest: 5f6b880e719b - shelve: pending changes temporary commit + <<<<<<< shelve: 5f6b880e719b - shelve: pending changes temporary commit g ======= f - >>>>>>> source: 81152db69da7 - shelve: changes to: commit stuff + >>>>>>> working-copy: 81152db69da7 - shelve: changes to: commit stuff $ cat f.orig g $ hg unshelve --abort -t false @@ -840,11 +840,11 @@ M f ? f.orig $ cat f - <<<<<<< dest: * - test: intermediate other change (glob) + <<<<<<< shelve: 6b563750f973 - test: intermediate other change g ======= f - >>>>>>> source: 81152db69da7 - shelve: changes to: commit stuff + >>>>>>> working-copy: 81152db69da7 - shelve: changes to: commit stuff $ cat f.orig g $ hg unshelve --abort