Re: How to perform regex upgrade? (vendor branches)

On Thu, Feb 19, 2004 at 03:47:23AM +0300, Andrey Chernov wrote:
> To whom it may interest.
> Since I am fear now to deal with vendor branches (while latest issue still 
> unclear, was it done right or wrong, and at the moment of writing this I 
> believe it is right), I prefer to inform about my future 
> actions beforehead. 
> 
> As you can read in
> ftp://ftp.gnu.org/gnu/regex/README
> GNU stops to update regex as standalone library. Since I want to upgrade
> our grep to 2.4.2, I must to upgrade libregex first to version which is
> included into grep 2.4.2. I found it compatible. This is 3 files only
> (regex.c regex.h posix/regex.h). It means all other files of
> gnu/lib/libregex (configure, NEWS, etc. will be removed). The question is
> the same as the latest getopt* removal issue we discuss: how they can be
> removed properly, from HEAD branch or somehow else? Remember, this files
> still may be actual for not regex-upgraded FreeBSD 5 and 4.
> 
Simple:

1.  You import the new version on the vendor (FSF) branch that
    comprises of three files only.  The version should that of
    glibc, say v_X_Y.

2.  You remove old files from the vendor (FSF) branch that were
    not imported with this last upgrade, i.e. those that are on
    the FSF branch but don't have the v_X_Y tag.  (You verify
    this step by checking out -rFSF and -rv_x_y -- this should
    produce the same output.)

3.  You merge conflicts between FSF and HEAD (on HEAD), should
    there be any.

4.  You remove all locally modified in files from HEAD that are
    no longer needed, so that HEAD either (preferably) fully
    matches the FSF branch, or only contains the necessary
    differences.

Have a moment and take a look into ~ru/import/ on freefall.


Cheers,
-- 
Ruslan Ermilov
FreeBSD committer
ru_at_FreeBSD.org