Message 313015 - Python tracker

Message313015

Author	xdegaye
Recipients	benjamin.peterson, georg.brandl, jcea, serhiy.storchaka, vstinner, xdegaye
Date	2018-02-27.16:46:08
SpamBayes Score	-1.0
Marked as misclassified	Yes
Message-id	<1519749968.91.0.467229070634.issue17288@psf.upfronthosting.co.za>
In-reply-to

Content
Actually $ git rebase --onto master 3.7 bpo-17288 fails with one single change in Objects/frameobject.c and one simply needs to (as I have tested it) remove all the three confict markers in this file and remove the following two lines that were enclosed by these markers: min_addr = Py_MIN(new_lasti, f->f_lasti); max_addr = Py_MAX(new_lasti, f->f_lasti); then run: $ git add Objects/frameobject.c $ git rebase --continue $ git co master; git merge bpo-17288

Content

Actually

    $ git rebase --onto master 3.7 bpo-17288

fails with one single change in Objects/frameobject.c and one simply needs to (as I have tested it)
remove all the three confict markers in this file and remove the following two lines that were enclosed by these markers:

    min_addr = Py_MIN(new_lasti, f->f_lasti);
    max_addr = Py_MAX(new_lasti, f->f_lasti);

then run:

    $ git add Objects/frameobject.c
    $ git rebase --continue
    $ git co master; git merge bpo-17288

History
Date	User	Action	Args
2018-02-27 16:46:08	xdegaye	set	recipients: + xdegaye, georg.brandl, jcea, vstinner, benjamin.peterson, serhiy.storchaka
2018-02-27 16:46:08	xdegaye	set	messageid: <1519749968.91.0.467229070634.issue17288@psf.upfronthosting.co.za>
2018-02-27 16:46:08	xdegaye	link	issue17288 messages
2018-02-27 16:46:08	xdegaye	create