Mercurial > public > mercurial-scm > hg

comparison mercurial/merge.py @ 3876:1e0b94cfba0e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Remove deprecated old-style branch support
author Matt Mackall <mpm@selenic.com>
date Tue, 12 Dec 2006 18:16:23 -0600
parents c0a12e6441a5
children abaee83ce0a6
comparison
equal deleted inserted replaced
3875:c0a12e6441a5 3876:1e0b94cfba0e
439 force = whether to force branch merging or file overwriting 439 force = whether to force branch merging or file overwriting
440 partial = a function to filter file lists (dirstate not updated) 440 partial = a function to filter file lists (dirstate not updated)
441 wlock = working dir lock, if already held 441 wlock = working dir lock, if already held
442 """ 442 """
443 443
444 if node is None:
445 node = "tip"
446
444 if not wlock: 447 if not wlock:
445 wlock = repo.wlock() 448 wlock = repo.wlock()
446 449
447 overwrite = force and not branchmerge 450 overwrite = force and not branchmerge
448 forcemerge = force and branchmerge 451 forcemerge = force and branchmerge