Re: CVS update: subversion/apr - Imported sources

BB <brian@collab.net> writes:
> Is there some way we can just draw from the apache CVS tree, rather than
> import it over and over?

Not really -- the apr/ subdirectory of the apache tree is not
sufficient as it stands. We have to do some semi-automated tweaking
every time, and that tweaking requires the full apache tree; only then
can we import. Here's subversion/apr/README.svn:

---------------------------------------------------------------------------
This is the Subversion project's vendor branch of the Apache Portable
Runtime (APR) library. It was imported with

     CVSROOT=:pserver:kfogel@cvs.tigris.org:/cvs \
     cvs import -ko -I ! -m "apache-2.0_20000707/src/lib/apr/" \
     subversion/apr_exp apache CVS_2_0_20000707

Follow this recipe to upgrade the vendor branch:

   1. Get the latest Apache source tree, as described by
      http://dev.apache.org/anoncvs.txt:

          cvs -d :pserver:anoncvs@www.apache.org:/home/cvspublic login
            (password "anoncvs")
          cvs -d :pserver:anoncvs@www.apache.org:/home/cvspublic co apache-2.0

   2. Get rid of its CVS subdirectories and .cvsignore files (you
      don't want to import those):

          cd apache-2.0
          find . -type d -name CVS | xargs rm -r
          find . -name .cvsignore | xargs rm -r

   3. Configure the tree, and place install-sh where import will
      find it:

          cd src
          ./buildconf
          cp install-sh lib/apr

      These steps are necessary because apache_X.Y/src/lib/apr/
      doesn't ship with a configure script -- you have to generate
      it first, and you need to be in the Apache tree to do so. And
      apr/configure won't get very far if it can't find
      `install-sh'.

   5. (Re)import the lib/apr subdir, again on the vendor branch,
      replacing the letters with the appropriate numbers:

          cd lib/apr
          CVSROOT=:pserver:kfogel@cvs.tigris.org:/cvs \
          cvs import -ko -I ! -m "upgrade to apache-N.M cvs YYYYMMDD apr" \
              subversion/apr apache CVS_N_M_YYYYMMDD

If you get any conflicts, then do

   cvs checkout -j PREVIOUS_RELEASE_TAG -j NEW_RELEASE_TAG subversion/apr

resolve the conflict, and commit. You shouldn't get conflicts unless
we've made local changes to the Subversion branch of APR, which we
probably won't have to do.
Received on Sat Oct 21 14:36:05 2006