Mercurial > public > mercurial-scm > hg

comparison 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
comparison
equal deleted inserted replaced
29098:2822e9a5263b 29099:bdc86e178255
1440 pas = [None] 1440 pas = [None]
1441 if ancestor is not None: 1441 if ancestor is not None:
1442 pas = [repo[ancestor]] 1442 pas = [repo[ancestor]]
1443 1443
1444 if node is None: 1444 if node is None:
1445 if (repo.ui.configbool('devel', 'all-warnings') 1445 repo.ui.develwarn('update with no target', 'oldapi')
1446 or repo.ui.configbool('devel', 'oldapi')):
1447 repo.ui.develwarn('update with no target')
1448 rev, _mark, _act = destutil.destupdate(repo) 1446 rev, _mark, _act = destutil.destupdate(repo)
1449 node = repo[rev].node() 1447 node = repo[rev].node()
1450 1448
1451 overwrite = force and not branchmerge 1449 overwrite = force and not branchmerge
1452 1450