Mercurial Mercurial > hg / 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.
merge: directly get destination from destutil
authorPierre-Yves David <pierre-yves.david@fb.com>
Thu, 15 Oct 2015 01:19:32 +0100
changeset 26715 652dfb1eff14
parent 26714 9903261dcc81
child 26716 c027641f8a83
merge: directly get destination from destutil There is no real value in using the revset over the function. The revset have no remaining users and will be taken care of in a later changesets.
mercurial/commands.py file | annotate | diff | comparison | revisions 
--- a/mercurial/commands.py	Thu Oct 15 01:11:00 2015 +0100
+++ b/mercurial/commands.py	Thu Oct 15 01:19:32 2015 +0100
@@ -4901,7 +4901,7 @@
         node = scmutil.revsingle(repo, node).node()
 
     if not node:
-        node = scmutil.revsingle(repo, '_mergedefaultdest()').node()
+        node = repo[destutil.destmerge(repo)].node()
 
     if opts.get('preview'):
         # find nodes that are ancestors of p2 but not of p1
Mercurial