Mercurial > public > mercurial-scm > hg

comparison mercurial/commands.py @ 16864:92cfde8728ac

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge with stable
author Matt Mackall <mpm@selenic.com>
date Mon, 04 Jun 2012 16:59:57 -0500
parents d71ada5a6a33 9c86ef980d9e
children 91f3ac205816
comparison
equal deleted inserted replaced
16863:bbedef66c6f3 16864:92cfde8728ac
2742 # ui.forcemerge is an internal variable, do not document 2742 # ui.forcemerge is an internal variable, do not document
2743 repo.ui.setconfig('ui', 'forcemerge', opts.get('tool', '')) 2743 repo.ui.setconfig('ui', 'forcemerge', opts.get('tool', ''))
2744 stats = mergemod.update(repo, ctx.node(), True, True, False, 2744 stats = mergemod.update(repo, ctx.node(), True, True, False,
2745 ctx.p1().node()) 2745 ctx.p1().node())
2746 finally: 2746 finally:
2747 ui.setconfig('ui', 'forcemerge', '') 2747 repo.ui.setconfig('ui', 'forcemerge', '')
2748 # drop the second merge parent 2748 # drop the second merge parent
2749 repo.setparents(current.node(), nullid) 2749 repo.setparents(current.node(), nullid)
2750 repo.dirstate.write() 2750 repo.dirstate.write()
2751 # fix up dirstate for copies and renames 2751 # fix up dirstate for copies and renames
2752 cmdutil.duplicatecopies(repo, ctx.rev(), ctx.p1().rev()) 2752 cmdutil.duplicatecopies(repo, ctx.rev(), ctx.p1().rev())