From owner-freebsd-current@FreeBSD.ORG Wed Aug 28 00:36:37 2013 Return-Path: Delivered-To: freebsd-current@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id 173D079E for ; Wed, 28 Aug 2013 00:36:37 +0000 (UTC) (envelope-from pfg@FreeBSD.org) Received: from nm8-vm0.bullet.mail.bf1.yahoo.com (nm8-vm0.bullet.mail.bf1.yahoo.com [98.139.213.95]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 950B62E64 for ; Wed, 28 Aug 2013 00:36:36 +0000 (UTC) Received: from [98.139.212.153] by nm8.bullet.mail.bf1.yahoo.com with NNFMP; 28 Aug 2013 00:36:29 -0000 Received: from [98.139.211.199] by tm10.bullet.mail.bf1.yahoo.com with NNFMP; 28 Aug 2013 00:36:28 -0000 Received: from [127.0.0.1] by smtp208.mail.bf1.yahoo.com with NNFMP; 28 Aug 2013 00:36:28 -0000 X-Yahoo-Newman-Id: 956976.9222.bm@smtp208.mail.bf1.yahoo.com X-Yahoo-Newman-Property: ymail-3 X-YMail-OSG: NawODkYVM1nKLknsQclgc2VJXD.KEoKM_yRgDNn20jnAerd TViDRHEm0SM8k1UbCKVLr4czu5WGwZUMthMq4Jpmnetoy_lCX7lZ2eBjHcpq dp4eugxw_bHI7grfuK49GVI0lUbYT9PjadvbLuVimQUpp42g5fdS1nLY088p 7P79xjktXIwR4X3eAsBnGqwOvVjhj2U2B6v9nUIExxFvMPlDk._GvsFKDqr1 Y6jShEAt_xtv9aCaxYW7p27iL1f63cDE_HMkbjxrEUL_3mNa4ghJKFAUxk1R KUyvS3FEdFUjdd2F5OnC1muXy_gejydsXyFyMuU7hvxUp49S5No12Rsgx5p2 SY1PpbqJGvbXEVC803Ru1RHMlcW5CejawH1v3LDGc44NDbEV7KHX_F8plwgb Ohy98YXaLWRg3DTaPogZNoiIc2DiBbZ8n6eBOXooQlp_6ozaK2QwZmoRbkD1 7ZBtpSMzY5oqOukReafCEzj8Bnnw99m4rvmmf6xcSxRLNElNVJHSrN6y.k7q 3Pny0Xg1TeaORnbnp8dmdN1ow4MsrRwZmea44I6mrM6V4ChxOxdg34FEpF2b QmshYl4b1MwCQVtCQpXxDvFbkFq4tjDKPGOf_mIXk3Ly3vby1eWvIuGHphMc i_6iZ9P87w5z8HQv3usRr1qkKUA-- X-Yahoo-SMTP: xcjD0guswBAZaPPIbxpWwLcp9Unf X-Rocket-Received: from [192.168.0.102] (pfg@190.157.126.109 with ) by smtp208.mail.bf1.yahoo.com with SMTP; 27 Aug 2013 17:36:28 -0700 PDT Message-ID: <521D460B.3040705@FreeBSD.org> Date: Tue, 27 Aug 2013 19:36:27 -0500 From: Pedro Giffuni Organization: FreeBSD User-Agent: Mozilla/5.0 (Windows NT 6.2; WOW64; rv:17.0) Gecko/20130801 Thunderbird/17.0.8 MIME-Version: 1.0 To: sbruno@freebsd.org Subject: Re: bsd patch regression? References: <1377644312.6359.27.camel@localhost> In-Reply-To: <1377644312.6359.27.camel@localhost> Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 8bit Cc: freebsd-current@FreeBSD.org X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.14 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: Wed, 28 Aug 2013 00:36:37 -0000 Hi Sean; El 27/08/2013 5:58 p. m., Sean Bruno escribió: > Colin generated a patch for xen things that does some pretty typical > behavior. bsdpatch really didn't handle it well and rejected some > things and flat out refused to create sys/modules/xenhvm/Makefile for > me. > > http://lists.freebsd.org/pipermail/freebsd-xen/2013-August/001697.html > > When applying this patch with gnupatch I get: > http://people.freebsd.org/~sbruno/gnupatch.txt > > > When applying this patch with bsdpatch I get: > http://people.freebsd.org/~sbruno/bsdpatch.txt > I note that you are using GNU patch from the ports tree. It would appear that both utilities reject the patches for: sys/amd64/conf/XENHVM sys/i386/conf/XENHVM bsdpatch is uglily more verbose and handles the rejected patches much less gracefully but it seems like gpatch also has issues with the same patches. I am not sure we can call this a regression: please note that bsd patch is meant to replace the ancient GNU patch that we had in the tree (it's still there under the name "gnupatch"). We ran an exp-run on ports and there was only a small regression related to the patch level which is a little stricter in BSD patch. > > Any ideas here? > Not very helpful but I suggest using "svn patch" when possible. :( Pedro.