Date: Thu, 6 Oct 2016 09:23:10 -0600 From: Sean Bruno <sbruno@freebsd.org> To: freebsd-current@freebsd.org Subject: Re: Large patch/diff refuses to apply Message-ID: <e000a757-7d6d-2203-7aa6-8c71b7d84d2d@freebsd.org> In-Reply-To: <f312318f-4ebe-0917-cab9-ff7d7e200759@freebsd.org> References: <abd48514-c699-888d-1ba3-f6e4a8f7f05c@freebsd.org> <20161006142339.GF6177@zxy.spb.ru> <a15d4a57-5a43-09c4-1535-ce68f716c93c@freebsd.org> <CAOtMX2gHRDE73csXK78E3XnPNTjSCw_zXAiSY_fP=iRw-EewGg@mail.gmail.com> <f312318f-4ebe-0917-cab9-ff7d7e200759@freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --XpslqhaiTrVv4iKSDRvJx9lsjNj7qMkX5 Content-Type: multipart/mixed; boundary="7NAX0BuCvSPqDvwN6XbLCugbxVLeP0u76" From: Sean Bruno <sbruno@freebsd.org> To: freebsd-current@freebsd.org Message-ID: <e000a757-7d6d-2203-7aa6-8c71b7d84d2d@freebsd.org> Subject: Re: Large patch/diff refuses to apply References: <abd48514-c699-888d-1ba3-f6e4a8f7f05c@freebsd.org> <20161006142339.GF6177@zxy.spb.ru> <a15d4a57-5a43-09c4-1535-ce68f716c93c@freebsd.org> <CAOtMX2gHRDE73csXK78E3XnPNTjSCw_zXAiSY_fP=iRw-EewGg@mail.gmail.com> <f312318f-4ebe-0917-cab9-ff7d7e200759@freebsd.org> In-Reply-To: <f312318f-4ebe-0917-cab9-ff7d7e200759@freebsd.org> --7NAX0BuCvSPqDvwN6XbLCugbxVLeP0u76 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable On 10/06/16 09:19, Sean Bruno wrote: >=20 >=20 > On 10/06/16 09:00, Alan Somers wrote: >> On Thu, Oct 6, 2016 at 8:41 AM, Sean Bruno <sbruno@freebsd.org> wrote:= >>> >>> >>> On 10/06/16 08:23, Slawa Olhovchenkov wrote: >>>> On Thu, Oct 06, 2016 at 07:57:57AM -0600, Sean Bruno wrote: >>>> >>>>> I'm doing a large amount of change to ixgbe(4) in support of IFLIB >>>>> implementations and running into failures when trying to apply larg= e >>>>> diffs. This is causing phabricator reviews to be unuseable as well= =2E >>>>> >>>>> I've setup two trees to test this. The first tree is used to gener= ate >>>>> the diff and the second (vanilla) is used to apply the diff. The e= ntire >>>>> patch fails to apply, so I'm assuming that the size of the diff is >>>>> failing because of a sanity check or something. >>>> >>>> No. This is expanded/collapsed keywords issuse: >>>> >>>> =3D=3D=3D >>>> -*******************************************************************= ***********/ >>>> -/*$FreeBSD$*/ >>>> =3D=3D=3D >>>> >>>> svn diff over repo generate patch w/ collapsed keywords. >>>> At working copy all keywords expanded. >>>> >>> >>> Ah, I see. Thank you. >>> >>> I am regenerating the failed files now. That seems to work (if I lea= ve >>> the keywords alone). >>> >>> sean >>> >> >> Also, I think the "svn patch" command (as opposed to plain "patch") >> can deal with the RCS keywords. >> >=20 > The use of "svn cp" also seems to generate a lot of failures as well. >=20 > I do want to maintain history between certain files when I go to commit= =2E > e.g. svn cp fileA new_fileA, but this seems to confuse the crap out of= > diff/patch no matter what I do. This leads to suffering with > phabricator as well. >=20 > For now, I'm not going to do the "svn cp" part of my commit, but I will= > try and do this when I am ready to shove my work into current. >=20 > sean >=20 A good example of what I was trying to do: svn mkdir sys/modules/ix/ix_iflib svn cp sys/modules/ix/Makefile sys/modules/ix/ix/ix_iflib/Makefile <edit sys/modules/ix/ix_iflib/Makefile> That seems to really confuse things. sean --7NAX0BuCvSPqDvwN6XbLCugbxVLeP0u76-- --XpslqhaiTrVv4iKSDRvJx9lsjNj7qMkX5 Content-Type: application/pgp-signature; name="signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="signature.asc" -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iQF8BAEBCgBmBQJX9mxeXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXRCQUFENDYzMkU3MTIxREU4RDIwOTk3REQx MjAxRUZDQTFFNzI3RTY0AAoJEBIB78oecn5kMGkH/31eD8SE/b6oAv2wtJMTtzHp 2Ey8lcrRZyg7P21jw10yfdcVFwURzQqTuyMFJU8VAtb/1BvlIRVi0wG18jqNTbo4 XJhXUe6SbL5Pq+SgIPR/bDGtqXB6eDeYJTsaiLRdVErC5C1QKeVuyi48P6+GNfII TMLBNsZT/MUeBykXt0/AtIQ3gaE1X6fe794bVlkeWqReqgDTcqembAoq1ByhRybo 6DFKOoCqdR1qz+Q+o8hDWD3TOrJmoKJDIx+RGM6X0IzF0bwJaiswCtF8LQzyG3Js Ht9hir173cINmKFcvrqML9MxIV/0SpLKbLff8b/r3zUNLG5FQl/gbuXvk6EeADI= =iLQy -----END PGP SIGNATURE----- --XpslqhaiTrVv4iKSDRvJx9lsjNj7qMkX5--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?e000a757-7d6d-2203-7aa6-8c71b7d84d2d>