Mercurial > public > mercurial-scm > hg

comparison mercurial/merge.py @ 19951:d51c4d85ec23 stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
spelling: random spell checker fixes
author Mads Kiilerich <madski@unity3d.com>
date Thu, 24 Oct 2013 01:49:56 +0800
parents ab2362e1672e
children ba6486076429
comparison
equal deleted inserted replaced
19950:cce7ab960312 19951:d51c4d85ec23
723 # call the hooks and exit early 723 # call the hooks and exit early
724 repo.hook('preupdate', throw=True, parent1=xp2, parent2='') 724 repo.hook('preupdate', throw=True, parent1=xp2, parent2='')
725 repo.hook('update', parent1=xp2, parent2='', error=0) 725 repo.hook('update', parent1=xp2, parent2='', error=0)
726 return 0, 0, 0, 0 726 return 0, 0, 0, 0
727 727
728 if pa not in (p1, p2): # nolinear 728 if pa not in (p1, p2): # nonlinear
729 dirty = wc.dirty(missing=True) 729 dirty = wc.dirty(missing=True)
730 if dirty or onode is None: 730 if dirty or onode is None:
731 # Branching is a bit strange to ensure we do the minimal 731 # Branching is a bit strange to ensure we do the minimal
732 # amount of call to obsolete.background. 732 # amount of call to obsolete.background.
733 foreground = obsolete.foreground(repo, [p1.node()]) 733 foreground = obsolete.foreground(repo, [p1.node()])