378 shelvedfile(repo, name, filetype).unlink() |
378 shelvedfile(repo, name, filetype).unlink() |
379 |
379 |
380 def finishmerge(ui, repo, ms, stripnodes, name, opts): |
380 def finishmerge(ui, repo, ms, stripnodes, name, opts): |
381 # Reset the working dir so it's no longer in a merge state. |
381 # Reset the working dir so it's no longer in a merge state. |
382 dirstate = repo.dirstate |
382 dirstate = repo.dirstate |
383 for f in ms: |
383 dirstate.setparents(dirstate._pl[0]) |
384 if dirstate[f] == 'm': |
|
385 dirstate.normallookup(f) |
|
386 dirstate._pl = (dirstate._pl[0], nullid) |
|
387 dirstate._dirty = dirstate._dirtypl = True |
|
388 shelvedstate.clear(repo) |
384 shelvedstate.clear(repo) |
389 |
385 |
390 def unshelvecontinue(ui, repo, state, opts): |
386 def unshelvecontinue(ui, repo, state, opts): |
391 # We're finishing off a merge. First parent is our original |
387 # We're finishing off a merge. First parent is our original |
392 # parent, second is the temporary "fake" commit we're unshelving. |
388 # parent, second is the temporary "fake" commit we're unshelving. |