Submitter | Pierre-Yves David |
---|---|
Date | May 5, 2016, 5:05 p.m. |
Message ID | <efee6a430f8e63e9d5d9.1462467955@nodosa.octopoid.net> |
Download | mbox | patch |
Permalink | /patch/14930/ |
State | Accepted |
Delegated to: | Yuya Nishihara |
Headers | show |
Comments
Patch
diff -r d671ff0fad1c -r efee6a430f8e mercurial/merge.py --- a/mercurial/merge.py Thu May 05 16:03:56 2016 +0200 +++ b/mercurial/merge.py Thu May 05 16:04:19 2016 +0200 @@ -1442,9 +1442,7 @@ 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') + repo.ui.develwarn('update with no target', 'oldapi') rev, _mark, _act = destutil.destupdate(repo) node = repo[rev].node()