Xavier de Gaye <xdeg...@gmail.com> added the comment:
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
----------
_______________________________________
Python tracker <rep...@bugs.python.org>
<https://bugs.python.org/issue17288>
_______________________________________
_______________________________________________
Python-bugs-list mailing list
Unsubscribe:
https://mail.python.org/mailman/options/python-bugs-list/archive%40mail-archive.com
