On 01/27/2017 03:40 AM, Anders Darander wrote:
Hi,
* Patchwork <patchw...@patchwork.openembedded.org> [170127 10:23]:
Series: Python3 packaging fixes
Revision: 1
URL : https://patchwork.openembedded.org/series/5024/
State : failure
* Issue Series does not apply on top of target branch
[test_series_merge_on_head]
Suggested fix Rebase your series on top of targeted branch
Targeted branch master (currently at a99cca0e8e)
This is likely due to issues with the email-patches. One of the patches,
0003, has a line > 998 characters (one line in the patch context, ie not
modified by me).
Anders, I do not think the problem is the patch format because git-am
does not complain at this stage. This is what I am getting when either
git-am or git-apply
git pw mbox 5024 | git am
Applying: python-3-manifest: fix adding imp to importlib
Applying: python3-manifest: move htlm.py to python3-html
Applying: python-3-manifest: add argparse to RDEPENDS for netclient
error: patch failed:
meta/recipes-devtools/python/python-3.5-manifest.inc:154
error: meta/recipes-devtools/python/python-3.5-manifest.inc: patch does
not apply
Patch failed at 0003 python-3-manifest: add argparse to RDEPENDS for
netclient
The copy of the patch that failed is found in:
/home/lsandov1/repos/openembedded-core/.git/rebase-apply/patch
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".
lsandov1@lsandov1-mobl2:~/repos/openembedded-core$ git am --abort
lsandov1@lsandov1-mobl2:~/repos/openembedded-core$ git pw mbox 5024 |
git apply --check
error: patch failed:
meta/recipes-devtools/python/python-3.5-manifest.inc:154
error: meta/recipes-devtools/python/python-3.5-manifest.inc: patch does
not apply
error: patch failed:
meta/recipes-devtools/python/python-3.5-manifest.inc:119
error: meta/recipes-devtools/python/python-3.5-manifest.inc: patch does
not apply
Meaning that you may need to fix merge failures for the manifest.inc file.
In the other hand, bad formatted patches have their own (patch) test,
and the report does not include it.
Retrieving the patch series from the branch at github should work, as
it's based on the current master, a99cca0e8e.
Cheers,
Anders
--
_______________________________________________
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
