Mercurial > public > mercurial-scm > hg

comparison mercurial/merge.py @ 26682:08b068240a1a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
update: "deprecate" call to 'merge.update' without a destination Now that all internal callers pre-compute and set a destination at a higher level it feels like we can kill this API. This will allow us to simplify this function. However I feel like this is a bit too central and critical to break now. I'm adding a devel warning to let extension make catch this in the next cycle.
author Pierre-Yves David <pierre-yves.david@fb.com>
date Mon, 05 Oct 2015 21:42:09 -0700
parents 2b955fec91e0
children f4a27c05c43f
comparison
equal deleted inserted replaced
26681:ca8170b5d370 26682:08b068240a1a
1078 pas = [None] 1078 pas = [None]
1079 if ancestor is not None: 1079 if ancestor is not None:
1080 pas = [repo[ancestor]] 1080 pas = [repo[ancestor]]
1081 1081
1082 if node is None: 1082 if node is None:
1083 if (repo.ui.configbool('devel', 'all-warnings')
1084 or repo.ui.configbool('devel', 'oldapi')):
1085 repo.ui.develwarn('update with no target')
1083 rev, _mark, _act = destutil.destupdate(repo) 1086 rev, _mark, _act = destutil.destupdate(repo)
1084 node = repo[rev].node() 1087 node = repo[rev].node()
1085 1088
1086 overwrite = force and not branchmerge 1089 overwrite = force and not branchmerge
1087 1090