From owner-freebsd-hackers@FreeBSD.ORG Tue Aug 23 20:33:41 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 72FC3106564A for ; Tue, 23 Aug 2011 20:33:41 +0000 (UTC) (envelope-from lichray@gmail.com) Received: from mail-iy0-f172.google.com (mail-iy0-f172.google.com [209.85.210.172]) by mx1.freebsd.org (Postfix) with ESMTP id 3BB1A8FC15 for ; Tue, 23 Aug 2011 20:33:41 +0000 (UTC) Received: by iye7 with SMTP id 7so1473807iye.17 for ; Tue, 23 Aug 2011 13:33:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=mime-version:in-reply-to:references:date:message-id:subject:from:to :content-type:content-transfer-encoding; bh=XDBRasUGpYDlxXikV4ui+vtrfvGrVg1ozrIuOhTwphw=; b=vQ+d9TwzGCS0dIrDGCk4qeiAI/cyw6ifn1qalMZm9QNt2eK7CmuegWbSpkJ6m+WY4x 9vj8VjFeil1L3fNgaWYfrHLXM2IuC1nLcr+7jbG6fDiMAxcaoli0sd0r5S8Il7r2IW3c rPAk2YLDGwHBiAa9RZwDfRf10Iu+v0KAgumNQ= MIME-Version: 1.0 Received: by 10.231.28.33 with SMTP id k33mr8461312ibc.81.1314131620815; Tue, 23 Aug 2011 13:33:40 -0700 (PDT) Received: by 10.231.34.198 with HTTP; Tue, 23 Aug 2011 13:33:40 -0700 (PDT) In-Reply-To: <20110823175133.GK18091@acme.spoerlein.net> References: <868vqt0xuc.fsf@gmail.com> <1313663436600-4711635.post@n5.nabble.com> <86hb5euofp.fsf@gmail.com> <20110823175133.GK18091@acme.spoerlein.net> Date: Tue, 23 Aug 2011 15:33:40 -0500 Message-ID: From: Zhihao Yuan To: Zhihao Yuan , Test Rat , freebsd-hackers@freebsd.org Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Cc: 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 20:33:41 -0000 On Tue, Aug 23, 2011 at 12:51 PM, Ulrich Sp=C3=B6rlein wrote: > 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 =C2=A0 =C2=A0 mox@current64:/usr/obj/usr/src/sys/GENERIC =C2=A0a= md64 >> >> >> >> [root@current64 /usr/src]# patch < ~/nvi2-freebsd-2011-08-17.diff >> > [...] >> >> =3D=3D=3D> 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 document= ed >> > in patch(1). And cl_bsd.c ended up in current directory (/usr/src) >> > >> > =C2=A0$ diffstat ~/nvi2-freebsd-2011-08-17.diff.gz | fgrep cl_bsd.c >> > =C2=A0 contrib/nvi2/cl/cl_bsd.c =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0| =C2=A0346 +++ >> >> 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. >> > >> > =C2=A0$ svn rm UPDATING >> > =C2=A0$ 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). > FreeBSD's nvi code is frozen for a long time, so my patch should not meet conflict. But since I touched rcsid recently, I'll upload non-rcsid (git-friendly) patches recently. > just fyi, > Uli > --=20 Zhihao Yuan, nickname lichray The best way to predict the future is to invent it. ___________________________________________________ 4BSD -- http://4bsd.biz/