branch | stable |
changeset 4988 | 588b3484c131 |
parent 4956 | 0fe5d74134d6 |
child 5000 | 8d38ad9c044f |
child 5093 | fd1d12497fdb |
--- a/hgext3rd/evolve/cmdrewrite.py Fri Dec 06 14:01:29 2019 +0100 +++ b/hgext3rd/evolve/cmdrewrite.py Sun Sep 29 11:47:18 2019 +0530 @@ -128,6 +128,8 @@ """ _checknotesize(ui, opts) opts = opts.copy() + if opts.get('patch') and opts.get('extract'): + raise error.Abort(_(b'cannot use both --patch and --extract')) if opts.get('patch'): return amendpatch(ui, repo, *pats, **opts) if opts.get('extract'):