Mercurial Mercurial > mercurial / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
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
authorPierre-Yves David <pierre-yves.david@ens-lyon.org>
Sun, 08 May 2016 10:43:41 +0200
changeset 29099 bdc86e178255
parent 29098 2822e9a5263b
child 29100 3fd94f603190
devel: use the new 'config' argument for the update develwarn
mercurial/merge.py file | annotate | diff | comparison | revisions 
--- 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()
mercurial