diff options
| author | Ned Batchelder <ned@nedbatchelder.com> | 2015-04-20 12:22:05 -0400 |
|---|---|---|
| committer | Ned Batchelder <ned@nedbatchelder.com> | 2015-04-20 12:22:05 -0400 |
| commit | 3afa8830b5b7fb71168a6c7395b49f18f1463fb9 (patch) | |
| tree | 6871a527498d4fc82e26858ba062e61290b80eab /coverage/tracer.c | |
| parent | 1b81747e52752a30be1c4271e24d23a7cb3f71b4 (diff) | |
| download | python-coveragepy-git-3afa8830b5b7fb71168a6c7395b49f18f1463fb9.tar.gz | |
I don't know how to resolve conflicts I guess.
Diffstat (limited to 'coverage/tracer.c')
| -rw-r--r-- | coverage/tracer.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/coverage/tracer.c b/coverage/tracer.c index 1ce5ed20..32f7c656 100644 --- a/coverage/tracer.c +++ b/coverage/tracer.c @@ -614,16 +614,13 @@ CTracer_handle_call(CTracer *self, PyFrameObject *frame) SHOWLOG(self->pdata_stack->depth, frame->f_lineno, filename, "skipped"); } -<<<<<<< local self->cur_entry.disposition = disposition; - self->cur_entry.last_line = -1; -======= + /* A call event is really a "start frame" event, and can happen for * re-entering a generator also. f_lasti is -1 for a true call, and a * real byte offset for a generator re-entry. */ self->cur_entry.last_line = (frame->f_lasti < 0) ? -1 : frame->f_lineno; ->>>>>>> other ok: ret = RET_OK; |