Re: Large patch/diff refuses to apply

From: Slawa Olhovchenkov <slw_at_zxy.spb.ru>
Date: Thu, 6 Oct 2016 17:23:39 +0300
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.
Received on Thu Oct 06 2016 - 12:23:43 UTC

This archive was generated by hypermail 2.4.0 : Wed May 19 2021 - 11:41:08 UTC