From owner-freebsd-current@freebsd.org Thu Oct 6 15:20:01 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 1693DBE99B4 for ; Thu, 6 Oct 2016 15:20:01 +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 DAB1A305; Thu, 6 Oct 2016 15:20:00 +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 64AFA1928AD; Thu, 6 Oct 2016 15:19:54 +0000 (UTC) Subject: Re: Large patch/diff refuses to apply To: Alan Somers References: <20161006142339.GF6177@zxy.spb.ru> Cc: Slawa Olhovchenkov , freebsd-current From: Sean Bruno Message-ID: Date: Thu, 6 Oct 2016 09:19:51 -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: Content-Type: multipart/signed; micalg=pgp-sha512; protocol="application/pgp-signature"; boundary="Cvhdp4BUxX7dHJWuXNC7wOxcakK6NFXTg" 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 15:20:01 -0000 This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --Cvhdp4BUxX7dHJWuXNC7wOxcakK6NFXTg Content-Type: multipart/mixed; boundary="C0v248WlPaqFdC5ksXxpgmTl0iA03DOPl" From: Sean Bruno To: Alan Somers Cc: Slawa Olhovchenkov , freebsd-current Message-ID: Subject: Re: Large patch/diff refuses to apply References: <20161006142339.GF6177@zxy.spb.ru> In-Reply-To: --C0v248WlPaqFdC5ksXxpgmTl0iA03DOPl Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable On 10/06/16 09:00, Alan Somers wrote: > On Thu, Oct 6, 2016 at 8:41 AM, Sean Bruno 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 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 genera= te >>>> the diff and the second (vanilla) is used to apply the diff. The en= tire >>>> 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 leav= e >> the keywords alone). >> >> sean >> >=20 > 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. I do want to maintain history between certain files when I go to commit. 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. 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. sean --C0v248WlPaqFdC5ksXxpgmTl0iA03DOPl-- --Cvhdp4BUxX7dHJWuXNC7wOxcakK6NFXTg 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 iQF8BAEBCgBmBQJX9muXXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXRCQUFENDYzMkU3MTIxREU4RDIwOTk3REQx MjAxRUZDQTFFNzI3RTY0AAoJEBIB78oecn5kr7AH/i+RdOYZUWQoFUqYTpIv8hIg w0fYSonB+VDO5GVVuyljKoV4t1OVSa+G2fnASFHLf9OzNeBK14I8kPYnxlda0jLO gUp+KeEnaUj2+9LcuvqloOcNdLa1OUVbjb0m7K3ubIvPEmLBPloEwHbSv08zsoPP 6PXrsxTVND46/CsOKDEkTz19jOsWyvUbbBBggPstKRkr9AeZckKRFhqAyt1sfd14 suO5ZfAOoML68rO9vlAj5UdhSzPwik6ehW3XJZfrv4tLkEWzS0eAU7yTOngL+Xmn mGNjjAKf5bRhphnLfy3jcLcmNuUMTN39lqAHpN6bn7lh+YzRE18QerS81zvpZ1E= =92o8 -----END PGP SIGNATURE----- --Cvhdp4BUxX7dHJWuXNC7wOxcakK6NFXTg--