# HG changeset patch # User Pierre-Yves David # Date 2015-10-06 04:42:09 # Node ID 08b068240a1a57fd20eee474260dca13953b1b88 # Parent ca8170b5d3704de02dc93295960ceacbb1ab2112 update: "deprecate" call to 'merge.update' without a destination Now that all internal callers pre-compute and set a destination at a higher level it feels like we can kill this API. This will allow us to simplify this function. However I feel like this is a bit too central and critical to break now. I'm adding a devel warning to let extension make catch this in the next cycle. diff --git a/mercurial/merge.py b/mercurial/merge.py --- a/mercurial/merge.py +++ b/mercurial/merge.py @@ -1080,6 +1080,9 @@ def update(repo, node, branchmerge, forc pas = [repo[ancestor]] if node is None: + if (repo.ui.configbool('devel', 'all-warnings') + or repo.ui.configbool('devel', 'oldapi')): + repo.ui.develwarn('update with no target') rev, _mark, _act = destutil.destupdate(repo) node = repo[rev].node()