Date: Thu, 6 Oct 2016 17:23:39 +0300 From: Slawa Olhovchenkov <slw@zxy.spb.ru> To: Sean Bruno <sbruno@freebsd.org> Cc: freebsd-current <freebsd-current@freebsd.org> Subject: Re: Large patch/diff refuses to apply Message-ID: <20161006142339.GF6177@zxy.spb.ru> In-Reply-To: <abd48514-c699-888d-1ba3-f6e4a8f7f05c@freebsd.org> References: <abd48514-c699-888d-1ba3-f6e4a8f7f05c@freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
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.
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20161006142339.GF6177>