From owner-freebsd-current@freebsd.org Thu Oct 6 15:00:40 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 2DF16BE93FB for ; Thu, 6 Oct 2016 15:00:40 +0000 (UTC) (envelope-from asomers@gmail.com) Received: from mail-wm0-x22a.google.com (mail-wm0-x22a.google.com [IPv6:2a00:1450:400c:c09::22a]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G2" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id B898C8E9; Thu, 6 Oct 2016 15:00:39 +0000 (UTC) (envelope-from asomers@gmail.com) Received: by mail-wm0-x22a.google.com with SMTP id f193so295578024wmg.0; Thu, 06 Oct 2016 08:00:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:sender:in-reply-to:references:from:date:message-id :subject:to:cc; bh=V9KivNYGfgTh0VM1HC9d4/6I24DHHpcz9ZGVnDTglEA=; b=G+xZ4CJJFWsKuzPKP8MKe4zw4WMm5Ts8OSRQmiVe9BN9JstPsCzboFzj57SVChFsQ6 2nbcq80XNr7/8iZ2QZFkqn2ir1+lW8wICts3mjXsUvIa2EyHsgqHtGbB7sCrc7kuutQT bQw4mSfe1spRoT7V8NiAjQ/gn972QEQFqZlw+vezgket1np7xyCTzun6sY5KRKeUa7RK BRCt9LHIQpptNdKRCBOGqgVSTLlbCmXUTBg2GvS0rKacjTzoTUgvB3AjWr1IpnFTD7R+ EtAD74KAzKQW97rOM+ePCnQWGbflTQBcCPCbV+hd9aKo+18FQe19iHKodw8ojyEr7ElR DNcA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:sender:in-reply-to:references:from :date:message-id:subject:to:cc; bh=V9KivNYGfgTh0VM1HC9d4/6I24DHHpcz9ZGVnDTglEA=; b=euQY/eSZkf/l+HyU7SjnBiO1eAQt6pqvz0Glb5NPUe/XA0Np89z+xJ81zXIR8uHgai YjSInA+FOsBPZ77mHWxJKvlXwj86pBAmOO0CU6VywFch7/Jz8eoDc1DLhZzb2bxbUz9e iEQLH4ZjifU2oRH4dof/9DJx80qD8i1AVXYrmnAO3OQaG41iJcr+nP7iICy03rrxsi1T F6VJfAoUB9v/kc6c34092JhvdE/imjV/wTYit6hlLZlaRU4Ihk9jMGYRJtO6TQVz4Jrq 3fwuik7z9Bj9RdkA+mJsOYUvdooKalJjqsXR7cDICvYWnFhqHwfggxNwaRZAcEaeZ/4z Inyw== X-Gm-Message-State: AA6/9RmK3Pho8Y62zeszIiIVdYvBad8Aclp1rBjgPxKAS3q4fGa8OMYKLjuUFjYIIMEVFCHALYCVgMhyjHKiUA== X-Received: by 10.194.86.201 with SMTP id r9mr12660548wjz.5.1475766038152; Thu, 06 Oct 2016 08:00:38 -0700 (PDT) MIME-Version: 1.0 Sender: asomers@gmail.com Received: by 10.194.15.137 with HTTP; Thu, 6 Oct 2016 08:00:37 -0700 (PDT) In-Reply-To: References: <20161006142339.GF6177@zxy.spb.ru> From: Alan Somers Date: Thu, 6 Oct 2016 09:00:37 -0600 X-Google-Sender-Auth: 3Ra9-UAqxO_8cyXGVc8hnAUi6gY Message-ID: Subject: Re: Large patch/diff refuses to apply To: Sean Bruno Cc: Slawa Olhovchenkov , freebsd-current Content-Type: text/plain; charset=UTF-8 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 15:00:40 -0000 On Thu, Oct 6, 2016 at 8:41 AM, Sean Bruno 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.