Mercurial > evolve
changeset 1826:19df96c0d670
compat: drop hack around a 'graft' signature change
We only support recent only version of Mercurial now.
| author | Pierre-Yves David <pierre-yves.david@ens-lyon.org> |
|---|---|
| date | Tue, 28 Feb 2017 14:22:05 +0100 |
| parents | 377d94d6c889 |
| children | 15ec53d46f44 |
| files | hgext3rd/evolve/__init__.py |
| diffstat | 1 files changed, 1 insertions(+), 12 deletions(-) [+] |
line wrap: on
line diff
--- a/hgext3rd/evolve/__init__.py Tue Feb 28 14:21:17 2017 +0100 +++ b/hgext3rd/evolve/__init__.py Tue Feb 28 14:22:05 2017 +0100 @@ -4184,15 +4184,4 @@ with repo.vfs.open('topic', 'w') as f: f.write(orig.topic()) - try: - r = merge.graft(repo, orig, pctx, ['local', 'graft'], True) - except TypeError: - # not using recent enough mercurial - if len(orig.parents()) == 2: - raise error.Abort( - _("no support for evolving merge changesets yet"), - hint=_("Redo the merge and use `hg prune <old> --succ " - "<new>` to obsolete the old one")) - - r = merge.graft(repo, orig, pctx, ['local', 'graft']) - return r + return merge.graft(repo, orig, pctx, ['local', 'graft'], True)