This is the mail archive of the
gcc@gcc.gnu.org
mailing list for the GCC project.
Re: "Branch" vs "mainline" ? [was Re: Ada bugs]
On Sat, Apr 20, 2002 at 10:50:00AM -0400, gnat-dev@buzco.nyct.net wrote:
> On 02-04-17 14:32:44 Robert Dewar wrote:
> | We were not planning on a big Ada merge from the mailine to the branch before
> | the release, since we consider that this will diminish stability. But we
> | should and will check into the issue of reversions.
> === End quoted text ===
>
> This message confuses me totally. As far as the Ada portion of GCC is
> concerned, it seems to exist +only+ on the 3.1-pre branch. It was
> released to late by a day to make the 3.0.4 [mainline ?] release.
>
> So where is the "mainline" code to be merged into the "branch"?
The "mainline" doesn't refer to the most recent release, but to the
current development effort - which has branched away from the upcoming
3.1 release.
|
|\
| \
| --- 3.0.x
|
|
|\
| \
| --- 3.1-pre
|
HEAD (mainline)
--
Daniel Jacobowitz Carnegie Mellon University
MontaVista Software Debian GNU/Linux Developer