| 2 |
- |
1 |
This directory contains the virgin patch source on the vendor branch. Do
|
|
|
2 |
not under any circumstances commit new versions onto the mainline, new
|
|
|
3 |
versions or official-patch versions must be imported.
|
|
|
4 |
|
|
|
5 |
To prepare a new patch dist for import, extract it into a fresh directory
|
|
|
6 |
and remove the following files (and any others that are non-FreeBSD
|
|
|
7 |
specific):
|
|
|
8 |
|
|
|
9 |
memchr.c
|
|
|
10 |
mkinstalldirs
|
|
|
11 |
pc/*
|
|
|
12 |
rename.c
|
|
|
13 |
|
|
|
14 |
The only other change that was made to the original tarball was to
|
|
|
15 |
rename patch.man to patch.1.
|
|
|
16 |
|
|
|
17 |
patch has RCS Id, Name and Header tags. It needs to be imported with -ko.
|
|
|
18 |
|
|
|
19 |
It is imported from it's top level directory something like this:
|
|
|
20 |
cvs -n import -ko src/contrib/patch FSF patch_<version>
|
|
|
21 |
|
|
|
22 |
The -n option is "don't do anything" so you can see what is about to happen
|
|
|
23 |
first. Remove it when it looks ok.
|
|
|
24 |
|
|
|
25 |
The initial import was done with:
|
|
|
26 |
cvs import -ko src/contrib/patch FSF patch_2_4
|
|
|
27 |
|
|
|
28 |
When new versions are imported, cvs will give instructions on how to merge
|
|
|
29 |
the local and vendor changes when/if conflicts arise..
|
|
|
30 |
|
|
|
31 |
steve@freebsd.org - 29 June 1997
|
|
|
32 |
|
|
|
33 |
Current local changes:
|
|
|
34 |
- Make patch(1) compile -Wall clean.
|