From owner-freebsd-hackers@FreeBSD.ORG Tue Aug 23 17:51:35 2011 Return-Path: Delivered-To: freebsd-hackers@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 6A027106566B for ; Tue, 23 Aug 2011 17:51:35 +0000 (UTC) (envelope-from ulrich@spoerlein.net) Received: from acme.spoerlein.net (acme.spoerlein.net [IPv6:2a01:4f8:131:23c2::1]) by mx1.freebsd.org (Postfix) with ESMTP id EF79E8FC12 for ; Tue, 23 Aug 2011 17:51:34 +0000 (UTC) Received: from localhost (acme.spoerlein.net [IPv6:2a01:4f8:131:23c2::1]) by acme.spoerlein.net (8.14.4/8.14.4) with ESMTP id p7NHpXJU040129 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES128-SHA bits=128 verify=NO); Tue, 23 Aug 2011 19:51:33 +0200 (CEST) (envelope-from ulrich@spoerlein.net) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=spoerlein.net; s=dkim200908; t=1314121894; bh=HAwoKq2G6MzBC85/B1HpoAuLLVg+RfTeWITwra/tZmQ=; h=Date:From:To:Cc:Subject:Message-ID:References:MIME-Version: Content-Type:Content-Transfer-Encoding:In-Reply-To; b=k6WEXjy/Hx0FuFH2bcfp/Epybuz9PMxXPr+4mRKPOKfOV7glZ+3chiWLS0wHNq7bh 5LSkGuqQ6RJUWiHS9Iq7CoXIEHQ3mPOOyr+m5QZ1ur9wYxLF7PwbcWJJ5qMIYXAW8M SoQ2rtnfaNLDYZQVBUOWQIALCJ+N9+yDYEjYRnKo= Date: Tue, 23 Aug 2011 19:51:33 +0200 From: Ulrich =?utf-8?B?U3DDtnJsZWlu?= To: Zhihao Yuan Message-ID: <20110823175133.GK18091@acme.spoerlein.net> Mail-Followup-To: Zhihao Yuan , Test Rat , freebsd-hackers@freebsd.org References: <868vqt0xuc.fsf@gmail.com> <1313663436600-4711635.post@n5.nabble.com> <86hb5euofp.fsf@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: User-Agent: Mutt/1.5.21 (2010-09-15) X-Mailman-Approved-At: Tue, 23 Aug 2011 19:04:46 +0000 Cc: Test Rat , freebsd-hackers@freebsd.org Subject: Re: [nvi-iconv]Call for test X-BeenThere: freebsd-hackers@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Technical Discussions relating to FreeBSD List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 23 Aug 2011 17:51:35 -0000 On Thu, 2011-08-18 at 22:15:47 -0500, Zhihao Yuan wrote: > On Thu, Aug 18, 2011 at 9:26 PM, Test Rat wrote: > > timp writes: > > > >> Hi! > >> I just tried you patch on latest current with clang. > >> > >> [root@current64 /usr/src]# uname -a > >> FreeBSD current64 9.0-BETA1 FreeBSD 9.0-BETA1 #0: Thu Aug 18 03:56:45 MSK > >> 2011     mox@current64:/usr/obj/usr/src/sys/GENERIC  amd64 > >> > >> [root@current64 /usr/src]# patch < ~/nvi2-freebsd-2011-08-17.diff > > [...] > >> ===> usr.bin/vi (depend) > >> make: don't know how to make cl_bsd.c. Stop > >> *** Error code 2 > > > > Use `-p0' otherwise new directories won't be created. This is documented > > in patch(1). And cl_bsd.c ended up in current directory (/usr/src) > > > >  $ diffstat ~/nvi2-freebsd-2011-08-17.diff.gz | fgrep cl_bsd.c > >   contrib/nvi2/cl/cl_bsd.c                |  346 +++ > > zzz... I always use -p0 but I did not know what it does... > > > > > Zhihao Yuan writes: > >> The patch will create contrib/nvi2, and it will not remove the unused > >> contrib/nvi (patch(1) can not really remove files anyway). > > > > patch(1) can remove *empty* files with `-E', e.g. > > > >  $ svn rm UPDATING > >  $ svn di UPDATING | patch -E -d /usr/src > > Got it. But removing contrib/nvi with patch will just double the patch > size anyway. A svn rm will do it if some day the patch got committed. Since you already use github.com, why not clone https://github.com/freebsd/freebsd-head/ and do your work in a separate branch? People already using one of the github or gitorious clones can then easily download your branch and don't have to fight patch(1). just fyi, Uli