Mercurial > public > mercurial-scm > hg-stable

diff mercurial/merge.py @ 29099:bdc86e178255

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
devel: use the new 'config' argument for the update develwarn
author Pierre-Yves David <pierre-yves.david@ens-lyon.org>
date Sun, 08 May 2016 10:43:41 +0200
parents 3ceac01bc29f
children 899879becd65
line wrap: on
line diff
--- a/mercurial/merge.py	Sun May 08 10:43:41 2016 +0200
+++ b/mercurial/merge.py	Sun May 08 10:43:41 2016 +0200
@@ -1442,9 +1442,7 @@
             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')
+            repo.ui.develwarn('update with no target', 'oldapi')
             rev, _mark, _act = destutil.destupdate(repo)
             node = repo[rev].node()