mercurial/merge.py
changeset 29148 899879becd65
parent 29099 bdc86e178255
child 29216 ead25aa27a43
equal deleted inserted replaced
29147:ff07da10de4c 29148:899879becd65
  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             repo.ui.develwarn('update with no target', 'oldapi')
  1445             repo.ui.deprecwarn('update with no target', '3.9')
  1446             rev, _mark, _act = destutil.destupdate(repo)
  1446             rev, _mark, _act = destutil.destupdate(repo)
  1447             node = repo[rev].node()
  1447             node = repo[rev].node()
  1448 
  1448 
  1449         overwrite = force and not branchmerge
  1449         overwrite = force and not branchmerge
  1450 
  1450