Date: Thu, 6 Oct 2016 08:41:48 -0600 From: Sean Bruno <sbruno@freebsd.org> To: Slawa Olhovchenkov <slw@zxy.spb.ru> Cc: freebsd-current <freebsd-current@freebsd.org> Subject: Re: Large patch/diff refuses to apply Message-ID: <a15d4a57-5a43-09c4-1535-ce68f716c93c@freebsd.org> In-Reply-To: <20161006142339.GF6177@zxy.spb.ru> References: <abd48514-c699-888d-1ba3-f6e4a8f7f05c@freebsd.org> <20161006142339.GF6177@zxy.spb.ru>
next in thread | previous in thread | raw e-mail | index | archive | help
This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --LsuigKH5cVWTL5jLdNNp8dE86Jm1v08Ql Content-Type: multipart/mixed; boundary="5UKSVEgr1AHloTedHX3CKxj5Bj6a3DBK2" From: Sean Bruno <sbruno@freebsd.org> To: Slawa Olhovchenkov <slw@zxy.spb.ru> Cc: freebsd-current <freebsd-current@freebsd.org> Message-ID: <a15d4a57-5a43-09c4-1535-ce68f716c93c@freebsd.org> Subject: Re: Large patch/diff refuses to apply References: <abd48514-c699-888d-1ba3-f6e4a8f7f05c@freebsd.org> <20161006142339.GF6177@zxy.spb.ru> In-Reply-To: <20161006142339.GF6177@zxy.spb.ru> --5UKSVEgr1AHloTedHX3CKxj5Bj6a3DBK2 Content-Type: text/plain; charset=windows-1252 Content-Transfer-Encoding: quoted-printable On 10/06/16 08:23, Slawa Olhovchenkov wrote: > On Thu, Oct 06, 2016 at 07:57:57AM -0600, Sean Bruno wrote: >=20 >> I'm doing a large amount of change to ixgbe(4) in support of IFLIB >> implementations and running into failures when trying to apply large >> diffs. This is causing phabricator reviews to be unuseable as well. >> >> I've setup two trees to test this. The first tree is used to generate= >> the diff and the second (vanilla) is used to apply the diff. The enti= re >> patch fails to apply, so I'm assuming that the size of the diff is >> failing because of a sanity check or something. >=20 > No. This is expanded/collapsed keywords issuse: >=20 > =3D=3D=3D > -**********************************************************************= ********/ > -/*$FreeBSD$*/ > =3D=3D=3D >=20 > svn diff over repo generate patch w/ collapsed keywords. > At working copy all keywords expanded. >=20 Ah, I see. Thank you. I am regenerating the failed files now. That seems to work (if I leave the keywords alone). sean --5UKSVEgr1AHloTedHX3CKxj5Bj6a3DBK2-- --LsuigKH5cVWTL5jLdNNp8dE86Jm1v08Ql 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 iQF8BAEBCgBmBQJX9mKsXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXRCQUFENDYzMkU3MTIxREU4RDIwOTk3REQx MjAxRUZDQTFFNzI3RTY0AAoJEBIB78oecn5koC4H/iDGk/efynrYVsY31Z3pWzuD vtbTYss60FrIRqL9capzEkKQwUjiWM7R5kk0EEusNCaMmPwKqXnvprfwHgkQD2DS FwUBe4imMQsraMMrkYO/0KvHZPUnsjKlGD8aRrWB5bdQC4uMbqHf7AtNGkKBppcF i2vRolKIAtIcaE5B79JYR1mAy+bVRtbAa74ZABDn/n8ueFsj7/UFSnqSLATUS7Ad v/1mKd7bQEQeoaN1PjrHx/S9BiELG4Z0WOKD/teTgJ9NeawlIVPyejyYqsmZJYgF zDwDwBaO1VzzNbmsyLWwpDeNy+U5dVP+M09MQCR1fwsXg7QR99Qjn9175BpI3Pk= =9JDP -----END PGP SIGNATURE----- --LsuigKH5cVWTL5jLdNNp8dE86Jm1v08Ql--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?a15d4a57-5a43-09c4-1535-ce68f716c93c>