Mercurial Mercurial > pub > hg > evolve / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
destmerge: honor the 'onheadcheck' argument
authorPierre-Yves David <pierre-yves.david@ens-lyon.org>
Mon, 15 Aug 2016 01:50:15 +0200
changeset 1981 b467fe430404
parent 1980 3c4a20244771
child 1982 d87fc4f749e6
destmerge: honor the 'onheadcheck' argument This argument was introduced in Mercurial some time ago but the topic extension was never updated to take it in account. This is now fixed.
hgext3rd/topic/destination.py file | annotate | diff | comparison | revisions 
--- a/hgext3rd/topic/destination.py	Sun Aug 14 23:17:09 2016 +0200
+++ b/hgext3rd/topic/destination.py	Mon Aug 15 01:50:15 2016 +0200
@@ -16,7 +16,7 @@
     top = p1.topic()
     if top:
         heads = repo.revs('heads(topic(.)::topic(.))')
-        if p1.rev() not in heads:
+        if onheadcheck and p1.rev() not in heads:
             raise error.Abort(_("not at topic head, update or explicit"))
         elif 1 == len(heads):
             # should look at all branch involved but... later
evolve