Mercurial > hg
comparison mercurial/shelve.py @ 48592:bcc4820242cf
shelve: attempt to make merge labels more helpful
Differential Revision: https://phab.mercurial-scm.org/D12024
author | Martin von Zweigbergk <martinvonz@google.com> |
---|---|
date | Fri, 21 Jan 2022 13:49:11 -0800 |
parents | 6ecd0980d7f9 |
children | 6000f5b25c9b |
comparison
equal
deleted
inserted
replaced
48591:f1162b125991 | 48592:bcc4820242cf |
---|---|
998 with repo.ui.configoverride(overrides, b'unshelve'): | 998 with repo.ui.configoverride(overrides, b'unshelve'): |
999 ui.status(_(b'rebasing shelved changes\n')) | 999 ui.status(_(b'rebasing shelved changes\n')) |
1000 stats = merge.graft( | 1000 stats = merge.graft( |
1001 repo, | 1001 repo, |
1002 shelvectx, | 1002 shelvectx, |
1003 labels=[b'working-copy', b'shelve'], | 1003 labels=[ |
1004 b'working-copy', | |
1005 b'shelved change', | |
1006 b'parent of shelved change', | |
1007 ], | |
1004 keepconflictparent=True, | 1008 keepconflictparent=True, |
1005 ) | 1009 ) |
1006 if stats.unresolvedcount: | 1010 if stats.unresolvedcount: |
1007 tr.close() | 1011 tr.close() |
1008 | 1012 |