On Tue, Aug 23, 2011 at 12:51 PM, Ulrich Spörlein <[email protected]> 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 <[email protected]> wrote: >> > timp <[email protected]> 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 <[email protected]> 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). >
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 > -- Zhihao Yuan, nickname lichray The best way to predict the future is to invent it. ___________________________________________________ 4BSD -- http://4bsd.biz/ _______________________________________________ [email protected] mailing list http://lists.freebsd.org/mailman/listinfo/freebsd-hackers To unsubscribe, send any mail to "[email protected]"
