Mercurial > hg

changeset 30486:d6f3877b72c7

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
mergemod: drop support for merge.update without a target This was to be deleted after 3.9.
author Augie Fackler <augie@google.com>
date Mon, 21 Nov 2016 21:52:19 -0500
parents acd30a959980
children 88a448a12ae8
files mercurial/merge.py
diffstat 1 files changed, 0 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/mercurial/merge.py	Mon Nov 21 21:51:23 2016 -0500
+++ b/mercurial/merge.py	Mon Nov 21 21:52:19 2016 -0500
@@ -25,7 +25,6 @@
 )
 from . import (
     copies,
-    destutil,
     error,
     filemerge,
     obsolete,
@@ -1484,11 +1483,6 @@
         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]