Show More
@@ -221,20 +221,13 b' def applychanges(ui, repo, ctx, opts):' | |||
|
221 | 221 | cmdutil.revert(ui, repo, ctx, (wcpar, node.nullid), all=True) |
|
222 | 222 | stats = None |
|
223 | 223 | else: |
|
224 | repo.dirstate.beginparentchange() | |
|
225 | 224 | try: |
|
226 | 225 | # ui.forcemerge is an internal variable, do not document |
|
227 | 226 | repo.ui.setconfig('ui', 'forcemerge', opts.get('tool', ''), |
|
228 | 227 | 'histedit') |
|
229 |
stats = mergemod. |
|
|
230 | ctx.p1().node()) | |
|
228 | stats = mergemod.graft(repo, ctx, ctx.p1(), ['local', 'histedit']) | |
|
231 | 229 | finally: |
|
232 | 230 | repo.ui.setconfig('ui', 'forcemerge', '', 'histedit') |
|
233 | repo.setparents(wcpar, node.nullid) | |
|
234 | repo.dirstate.endparentchange() | |
|
235 | repo.dirstate.write() | |
|
236 | # fix up dirstate for copies and renames | |
|
237 | copies.duplicatecopies(repo, ctx.rev(), ctx.p1().rev()) | |
|
238 | 231 | return stats |
|
239 | 232 | |
|
240 | 233 | def collapse(repo, first, last, commitopts): |
General Comments 0
You need to be logged in to leave comments.
Login now