# HG changeset patch # User Pierre-Yves David # Date 2015-09-29 05:11:23 # Node ID c8b332b1eb1f84299cdf596e6a1f84c7e1a1cf8e # Parent 2aeeef1dc9a5c6d9a30fcd5b1c7d94cbcb3299e0 merge: get the default update destination from the function There is no value in using the revset instead of the extracted function. diff --git a/mercurial/merge.py b/mercurial/merge.py --- a/mercurial/merge.py +++ b/mercurial/merge.py @@ -21,6 +21,7 @@ from .node import ( ) from . import ( copies, + destutil, filemerge, obsolete, subrepo, @@ -994,9 +995,7 @@ def update(repo, node, branchmerge, forc pas = [repo[ancestor]] if node is None: - nodes = list(repo.set('_updatedefaultdest()')) - if nodes: - node = nodes[0].node() + node = repo[destutil.destupdate(repo)].node() overwrite = force and not branchmerge