equal
deleted
inserted
replaced
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 |