equal
deleted
inserted
replaced
3774 continue |
3774 continue |
3775 if not state._clearable and state.isunfinished(repo): |
3775 if not state._clearable and state.isunfinished(repo): |
3776 raise error.StateError(state.msg(), hint=state.hint()) |
3776 raise error.StateError(state.msg(), hint=state.hint()) |
3777 |
3777 |
3778 for s in statemod._unfinishedstates: |
3778 for s in statemod._unfinishedstates: |
3779 if s._opname == b'merge' or state._reportonly: |
3779 if s._opname == b'merge' or s._reportonly: |
3780 continue |
3780 continue |
3781 if s._clearable and s.isunfinished(repo): |
3781 if s._clearable and s.isunfinished(repo): |
3782 util.unlink(repo.vfs.join(s._fname)) |
3782 util.unlink(repo.vfs.join(s._fname)) |
3783 |
3783 |
3784 |
3784 |