From owner-freebsd-current@freebsd.org Thu Oct 6 14:41:53 2016 Return-Path: Delivered-To: freebsd-current@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 77C21AF6E95 for ; Thu, 6 Oct 2016 14:41:53 +0000 (UTC) (envelope-from sbruno@freebsd.org) Received: from mail.ignoranthack.me (ignoranthack.me [199.102.79.106]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 59170A42 for ; Thu, 6 Oct 2016 14:41:53 +0000 (UTC) (envelope-from sbruno@freebsd.org) Received: from [192.168.0.6] (97-123-129-224.albq.qwest.net [97.123.129.224]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) (Authenticated sender: sbruno@ignoranthack.me) by mail.ignoranthack.me (Postfix) with ESMTPSA id 857CA1928AD; Thu, 6 Oct 2016 14:41:51 +0000 (UTC) Subject: Re: Large patch/diff refuses to apply To: Slawa Olhovchenkov References: <20161006142339.GF6177@zxy.spb.ru> Cc: freebsd-current From: Sean Bruno Message-ID: Date: Thu, 6 Oct 2016 08:41:48 -0600 User-Agent: Mozilla/5.0 (X11; FreeBSD amd64; rv:45.0) Gecko/20100101 Thunderbird/45.2.0 MIME-Version: 1.0 In-Reply-To: <20161006142339.GF6177@zxy.spb.ru> Content-Type: multipart/signed; micalg=pgp-sha512; protocol="application/pgp-signature"; boundary="LsuigKH5cVWTL5jLdNNp8dE86Jm1v08Ql" X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 06 Oct 2016 14:41:53 -0000 This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --LsuigKH5cVWTL5jLdNNp8dE86Jm1v08Ql Content-Type: multipart/mixed; boundary="5UKSVEgr1AHloTedHX3CKxj5Bj6a3DBK2" From: Sean Bruno To: Slawa Olhovchenkov Cc: freebsd-current Message-ID: Subject: Re: Large patch/diff refuses to apply References: <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--