comparison mercurial/commands.py @ 27089:dbb30bc16fc2

resolve: record dirstate actions after performing resolutions

Some resolutions might lead to pending actions we need to perform in the
dirstate -- so perform them.

27088:e2b79f57903a

            except OSError as inst:
                if inst.errno != errno.ENOENT:
                    raise

        ms.commit()

        if not didwork and pats:
            ui.warn(_("arguments do not match paths that need resolving\n"))
        elif ms.mergedriver and ms.mdstate() != 's':
            # run conclude step when either a driver-resolved file is requested

27089:dbb30bc16fc2

            except OSError as inst:
                if inst.errno != errno.ENOENT:
                    raise

        ms.commit()
        ms.recordactions()

        if not didwork and pats:
            ui.warn(_("arguments do not match paths that need resolving\n"))
        elif ms.mergedriver and ms.mdstate() != 's':
            # run conclude step when either a driver-resolved file is requested