From owner-freebsd-current@freebsd.org Thu Oct 6 14:23:43 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 5E135AF67FE for ; Thu, 6 Oct 2016 14:23:43 +0000 (UTC) (envelope-from slw@zxy.spb.ru) Received: from zxy.spb.ru (zxy.spb.ru [195.70.199.98]) (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 2143FFB0; Thu, 6 Oct 2016 14:23:43 +0000 (UTC) (envelope-from slw@zxy.spb.ru) Received: from slw by zxy.spb.ru with local (Exim 4.86 (FreeBSD)) (envelope-from ) id 1bs9aF-000PXN-H6; Thu, 06 Oct 2016 17:23:39 +0300 Date: Thu, 6 Oct 2016 17:23:39 +0300 From: Slawa Olhovchenkov To: Sean Bruno Cc: freebsd-current Subject: Re: Large patch/diff refuses to apply Message-ID: <20161006142339.GF6177@zxy.spb.ru> References: MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: User-Agent: Mutt/1.5.24 (2015-08-30) X-SA-Exim-Connect-IP: X-SA-Exim-Mail-From: slw@zxy.spb.ru X-SA-Exim-Scanned: No (on zxy.spb.ru); SAEximRunCond expanded to false 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 14:23:43 -0000 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.