Re: GCC 3.0 Branch: Guidelines

[Mark Mitchell <mark at codesourcery dot com>]

>>>>> "Richard" == Richard Kenner <kenner@vlsi1.ultra.nyu.edu> writes:

    Richard> Stupid question: how (mechanically) does one check in a patch to the branch?

First, you want to have a tree that is on the branch.

You can convert an existing tree with:

  contrib/gcc_update -r gcc-3_0-branch

Or checkout a new one with:

  cvs co -r gcc-3_0-branch gcc

To check that you've done it right do:

  cvs status ChangeLog [or any other file]

The output should look like:

  ===================================================================
  File: globals.cc        Status: Up-to-date

     Working revision:    1.1
     Repository revision: 1.1     /cvs/gcc/egcs/libstdc++-v3/src/globals.cc,v
     Sticky Tag:          gcc-3_0-branch (branch: 1.1.4)
     Sticky Date:         (none)
     Sticky Options:      (none)

In particular, note the "sticky tag".

Then, just do an ordinary `cvs commit' in that tree.  That will
automatically put your change on the branch.  Doing a `cvs update' in
the tree with the `sticky tag' will get new changes on the branch, but
not new changes on the mainline.

An ordinary tree is equivalent to one checked out with `-r HEAD' where
`HEAD' is a magic branch name for the mainline.

--
Mark Mitchell                   mark@codesourcery.com
CodeSourcery, LLC               http://www.codesourcery.com