Update instructions to match recent practices

This commit is contained in:
Xin LI 2008-04-21 18:37:08 +00:00
parent 0c2d6f72b7
commit c784a71d0b
Notes: svn2git 2020-12-20 02:59:44 +00:00
svn path=/head/; revision=178387

View File

@ -9,9 +9,11 @@ $FreeBSD$
6. If there is conflicits, try to resolve them.
7. do build in f-nc/../../usr.bin/nc
8. If everything seems ok, do the actual import in v-nc:
cvs -n import src/contrib/netcat OPENBSD OPENBSD_<date>
cvs -n import src/contrib/netcat OPENBSD OPENBSD_<release>
Everything appears be Ok? Do:
cvs import src/contrib/netcat OPENBSD OPENBSD_<date>
cvs import src/contrib/netcat OPENBSD OPENBSD_<release>
(note: recently we import from OpenBSD's release branches
rather than importing -HEAD snapshots)
9. Resolve the conflicits with the patchset obtained in step 6.
delphij@FreeBSD.org - 06 Feb 2005
delphij@FreeBSD.org - 21 Apr 2008