Mercurial > evolve
diff hgext3rd/topic/__init__.py @ 3097:f06c86fd2ffd stable
topic: do to check to topic while amending
Right know the 'topic-mode' mess with amend. Especially in case of amending
merge where the merge is not properly detected.
| author | Pierre-Yves David <pierre-yves.david@octobus.net> |
|---|---|
| date | Fri, 20 Oct 2017 21:29:14 +0200 |
| parents | c458c0856ee5 |
| children | 6ef274e01f64 |
line wrap: on
line diff
--- a/hgext3rd/topic/__init__.py Fri Oct 20 21:43:13 2017 +0200 +++ b/hgext3rd/topic/__init__.py Fri Oct 20 21:29:14 2017 +0200 @@ -1004,6 +1004,8 @@ t = opts['topic'] with repo.vfs.open('topic', 'w') as f: f.write(t) + elif opts.get('amend'): + pass elif notopic and mayabort: msg = _("no active topic") raise error.Abort(msg, hint=hint)