diff options
| author | Xin LI <delphij@FreeBSD.org> | 2008-04-21 18:37:08 +0000 |
|---|---|---|
| committer | Xin LI <delphij@FreeBSD.org> | 2008-04-21 18:37:08 +0000 |
| commit | c784a71d0bcc2a4d611f8c6957c201a3cff4bf25 (patch) | |
| tree | 5b1b411c8225c894d96f0f893bfaff6c8ecdbf77 /contrib/netcat | |
| parent | 0c2d6f72b73dbf3e227628f6bc04295433213b2f (diff) | |
| download | src-test-c784a71d0bcc2a4d611f8c6957c201a3cff4bf25.tar.gz src-test-c784a71d0bcc2a4d611f8c6957c201a3cff4bf25.zip | |
Update instructions to match recent practices
Notes
Notes:
svn path=/head/; revision=178387
Diffstat (limited to 'contrib/netcat')
| -rw-r--r-- | contrib/netcat/FREEBSD-upgrade | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/contrib/netcat/FREEBSD-upgrade b/contrib/netcat/FREEBSD-upgrade index 5cba52bd65b22..5a52ebc648162 100644 --- a/contrib/netcat/FREEBSD-upgrade +++ b/contrib/netcat/FREEBSD-upgrade @@ -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 |