Mercurial > evolve
changeset 3395:02192ac8ef98
evolve: use better words in conflict markers of `hg evolve`
Though we call merge.graft internally, we still have the functionality to pass
the words we want to show up in conflict markers. So let's use better words
here.
| author | Pulkit Goyal <7895pulkit@gmail.com> |
|---|---|
| date | Thu, 11 Jan 2018 18:36:05 +0530 |
| parents | d1486760fb8d |
| children | 2f1520ef1c5b |
| files | hgext3rd/evolve/__init__.py tests/test-evolve-phase.t |
| diffstat | 2 files changed, 3 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/hgext3rd/evolve/__init__.py Thu Jan 11 18:38:09 2018 +0530 +++ b/hgext3rd/evolve/__init__.py Thu Jan 11 18:36:05 2018 +0530 @@ -2505,4 +2505,4 @@ with repo.vfs.open('topic', 'w') as f: f.write(orig.topic()) - return merge.graft(repo, orig, pctx, ['local', 'graft'], True) + return merge.graft(repo, orig, pctx, ['destination', 'evolving'], True)
--- a/tests/test-evolve-phase.t Thu Jan 11 18:38:09 2018 +0530 +++ b/tests/test-evolve-phase.t Thu Jan 11 18:36:05 2018 +0530 @@ -96,11 +96,11 @@ --- a/a Thu Jan 01 00:00:00 1970 +0000 +++ b/a Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +1,5 @@ - +<<<<<<< local: 87495ea7c9ec - test: b + +<<<<<<< destination: 87495ea7c9ec - test: b b2 +======= +c - +>>>>>>> graft: 13833940840c - test: c + +>>>>>>> evolving: 13833940840c - test: c $ hg glog @ 3 - 87495ea7c9ec b (draft)