Large patch/diff refuses to apply

[Sean Bruno]

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 generate
>> the diff and the second (vanilla) is used to apply the diff.  The entire
>> 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:
> 
> ===
> -******************************************************************************/
> -/*$FreeBSD$*/
> ===
> 
> 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 leave
the keywords alone).

sean

-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 603 bytes
Desc: OpenPGP digital signature
URL: <http://lists.freebsd.org/pipermail/freebsd-current/attachments/20161006/b04704db/attachment.sig>