Show More
@@ -485,7 +485,7 b' def applychanges(ui, repo, ctx, opts):' | |||||
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 editi |
|
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: |
General Comments 0
You need to be logged in to leave comments.
Login now