Mercurial > hg
comparison hgext/histedit.py @ 27603:8a87627d263a
histedit: fix comment in applychanges
| author | timeless <timeless@mozdev.org> |
|---|---|
| date | Wed, 30 Dec 2015 04:02:04 +0000 |
| parents | cfb26146a8cd |
| children | 0e0e25a5e12a |
comparison
equal
deleted
inserted
replaced
| 27602:67aa88e00fc7 | 27603:8a87627d263a |
|---|---|
| 483 def applychanges(ui, repo, ctx, opts): | 483 def applychanges(ui, repo, ctx, opts): |
| 484 """Merge changeset from ctx (only) in the current working directory""" | 484 """Merge changeset from ctx (only) in the current working directory""" |
| 485 wcpar = repo.dirstate.parents()[0] | 485 wcpar = repo.dirstate.parents()[0] |
| 486 if ctx.p1().node() == wcpar: | 486 if ctx.p1().node() == wcpar: |
| 487 # edits are "in place" we do not need to make any merge, | 487 # edits are "in place" we do not need to make any merge, |
| 488 # just applies changes on parent for edition | 488 # just applies changes on parent for editing |
| 489 cmdutil.revert(ui, repo, ctx, (wcpar, node.nullid), all=True) | 489 cmdutil.revert(ui, repo, ctx, (wcpar, node.nullid), all=True) |
| 490 stats = None | 490 stats = None |
| 491 else: | 491 else: |
| 492 try: | 492 try: |
| 493 # ui.forcemerge is an internal variable, do not document | 493 # ui.forcemerge is an internal variable, do not document |