Mercurial > evolve
changeset 5921:c04c4383f33e
evolve: drop quotes around node in a content divergence resolution message
| author | Anton Shestakov <av6@dwimlabs.net> |
|---|---|
| date | Mon, 17 May 2021 19:10:22 +0800 |
| parents | c1af4d9e46f4 |
| children | 8bffab1e7c4f |
| files | hgext3rd/evolve/evolvecmd.py tests/test-evolve-content-divergent-basic.t |
| diffstat | 2 files changed, 2 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/hgext3rd/evolve/evolvecmd.py Mon May 17 17:45:57 2021 +0800 +++ b/hgext3rd/evolve/evolvecmd.py Mon May 17 19:10:22 2021 +0800 @@ -574,7 +574,7 @@ local) compat.update(local) # merging the two content-divergent changesets - repo.ui.note(_(b"merging \"other\" %s changeset '%s'\n") % + repo.ui.note(_(b"merging \"other\" %s changeset %s\n") % (TROUBLES['CONTENTDIVERGENT'], other)) if progresscb: progresscb()
--- a/tests/test-evolve-content-divergent-basic.t Mon May 17 17:45:57 2021 +0800 +++ b/tests/test-evolve-content-divergent-basic.t Mon May 17 19:10:22 2021 +0800 @@ -517,7 +517,7 @@ merge:[3] More addition with: [2] More addition base: [1] More addition - merging "other" content-divergent changeset 'fc6349f931da' + merging "other" content-divergent changeset fc6349f931da resolving manifests merging a 0 files updated, 1 files merged, 0 files removed, 0 files unresolved