Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 23 Aug 2011 15:33:40 -0500
From:      Zhihao Yuan <lichray@gmail.com>
To:        Zhihao Yuan <lichray@gmail.com>, Test Rat <ttsestt@gmail.com>, freebsd-hackers@freebsd.org
Subject:   Re: [nvi-iconv]Call for test
Message-ID:  <CAGsORuCNJwwj9stHqMKS=1y8hd7Zga=V1zQ0EsHJCdryy0B3gw@mail.gmail.com>
In-Reply-To: <20110823175133.GK18091@acme.spoerlein.net>
References:  <CAGsORuBr=b-cJEAJO7cJ=j5dn04kJfR%2BHzz58Rjc29uTDZv4Xg@mail.gmail.com> <CAGsORuCsz_XzWntZ_y40SuAS%2B7saT7GzMUoTzpGgdCN5aTYuNg@mail.gmail.com> <868vqt0xuc.fsf@gmail.com> <CAGsORuDiq%2BgsGyV1Da0mUKj0JBnam584S2z5VFVcKyKM1qsVdw@mail.gmail.com> <1313663436600-4711635.post@n5.nabble.com> <86hb5euofp.fsf@gmail.com> <CAGsORuBJsP6AuB_biHJ9wv55=qhkb%2BWRQLpMUBkgA_OXuXKCbA@mail.gmail.com> <20110823175133.GK18091@acme.spoerlein.net>

next in thread | previous in thread | raw e-mail | index | archive | help
On Tue, Aug 23, 2011 at 12:51 PM, Ulrich Sp=C3=B6rlein <ulrich@spoerlein.ne=
t> 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 <ttsestt@gmail.com> wrote:
>> > timp <timp87@gmail.com> 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 <lichray@gmail.com> 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/



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?CAGsORuCNJwwj9stHqMKS=1y8hd7Zga=V1zQ0EsHJCdryy0B3gw>