On Thu, Oct 6, 2016 at 8:41 AM, Sean Bruno <sbruno_at_freebsd.org> 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 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 > Also, I think the "svn patch" command (as opposed to plain "patch") can deal with the RCS keywords.Received on Thu Oct 06 2016 - 13:00:40 UTC
This archive was generated by hypermail 2.4.0 : Wed May 19 2021 - 11:41:08 UTC