On Fri, Nov 22, 2019 at 11:12 AM Frode Nordahl <frode.nord...@canonical.com> wrote: > > This is weird, the patches apply on an up-to-date ovn repo with git am > on blobs from the list. > > I noticed the mailing list thread order is in reverse with patch > number two preceding patch number one, could that be the issue?
It may also be me editing the output from ``git format-patch`` prior to submitting, but cannot reproduce the error reported by the bot locally with blobs gleaned from list, so would love to hear your views on what's going on here. -- Frode Nordahl > -- > Frode Nordahl > > On Fri, Nov 22, 2019 at 10:59 AM 0-day Robot <ro...@bytheb.org> wrote: > > > > Bleep bloop. Greetings Frode Nordahl, I am a robot and I have tried out > > your patch. > > Thanks for your contribution. > > > > I encountered some error that I wasn't expecting. See the details below. > > > > > > git-am: > > fatal: sha1 information is lacking or useless (tests/ovn-northd.at). > > Repository lacks necessary blobs to fall back on 3-way merge. > > Cannot fall back to three-way merge. > > Patch failed at 0001 northd: Improve handling of pause and resume > > The copy of the patch that failed is found in: > > > > /var/lib/jenkins/jobs/upstream_build_from_pw/workspace/OVN/.git/rebase-apply/patch > > When you have resolved this problem, run "git am --resolved". > > If you prefer to skip this patch, run "git am --skip" instead. > > To restore the original branch and stop patching, run "git am --abort". > > > > > > Please check this out. If you feel there has been an error, please email > > acon...@redhat.com > > > > Thanks, > > 0-day Robot _______________________________________________ dev mailing list d...@openvswitch.org https://mail.openvswitch.org/mailman/listinfo/ovs-dev
