Mercurial > public > mercurial-scm > hg

comparison mercurial/merge.py @ 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 3c6893ba2d36
children 20a42325fdef
comparison
equal deleted inserted replaced
30485:acd30a959980 30486:d6f3877b72c7
23 nullid, 23 nullid,
24 nullrev, 24 nullrev,
25 ) 25 )
26 from . import ( 26 from . import (
27 copies, 27 copies,
28 destutil,
29 error, 28 error,
30 filemerge, 29 filemerge,
31 obsolete, 30 obsolete,
32 scmutil, 31 scmutil,
33 subrepo, 32 subrepo,
1482 p1 = pl[0] 1481 p1 = pl[0]
1483 pas = [None] 1482 pas = [None]
1484 if ancestor is not None: 1483 if ancestor is not None:
1485 pas = [repo[ancestor]] 1484 pas = [repo[ancestor]]
1486 1485
1487 if node is None:
1488 repo.ui.deprecwarn('update with no target', '3.9')
1489 rev, _mark, _act = destutil.destupdate(repo)
1490 node = repo[rev].node()
1491
1492 overwrite = force and not branchmerge 1486 overwrite = force and not branchmerge
1493 1487
1494 p2 = repo[node] 1488 p2 = repo[node]
1495 if pas[0] is None: 1489 if pas[0] is None:
1496 if repo.ui.configlist('merge', 'preferancestor', ['*']) == ['*']: 1490 if repo.ui.configlist('merge', 'preferancestor', ['*']) == ['*']: