[PATCH 2 of 2 deprecations] mergemod: drop support for merge.update without a target
Augie Fackler
raf at durin42.com
Mon Nov 21 22:01:37 EST 2016
# HG changeset patch
# User Augie Fackler <augie at google.com>
# Date 1479783139 18000
# Mon Nov 21 21:52:19 2016 -0500
# Node ID e46571ef16ffc14d1b887bf98d78b4f65e702b14
# Parent de8e9f6a830166fe1cdb14bca0433fa328681ece
mergemod: drop support for merge.update without a target
This was to be deleted after 3.9.
diff --git a/mercurial/merge.py b/mercurial/merge.py
--- a/mercurial/merge.py
+++ b/mercurial/merge.py
@@ -1484,11 +1484,6 @@ def update(repo, node, branchmerge, forc
if ancestor is not None:
pas = [repo[ancestor]]
- if node is None:
- repo.ui.deprecwarn('update with no target', '3.9')
- rev, _mark, _act = destutil.destupdate(repo)
- node = repo[rev].node()
-
overwrite = force and not branchmerge
p2 = repo[node]
More information about the Mercurial-devel
mailing list