From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 10744 invoked by alias); 3 Dec 2002 01:04:57 -0000 Mailing-List: contact gcc-help@gcc.gnu.org; run by ezmlm Precedence: bulk List-Archive: List-Post: List-Help: Sender: gcc-owner@gcc.gnu.org Received: (qmail 10718 invoked from network); 3 Dec 2002 01:04:56 -0000 Received: from unknown (HELO fencepost.gnu.org) (199.232.76.164) by sources.redhat.com with SMTP; 3 Dec 2002 01:04:56 -0000 Received: from monty-python.gnu.org ([199.232.76.173]) by fencepost.gnu.org with esmtp (Exim 4.10) id 18J1Ud-0002i5-01 for gcc@gnu.org; Mon, 02 Dec 2002 20:04:55 -0500 Received: from mail by monty-python.gnu.org with spam-scanned (Exim 4.10.13) id 18J1Sm-0001jU-00 for gcc@gnu.org; Mon, 02 Dec 2002 20:03:01 -0500 Received: from egil.codesourcery.com ([66.92.14.122]) by monty-python.gnu.org with esmtp (Exim 4.10.13) id 18J1Sl-0001jC-00 for gcc@gnu.org; Mon, 02 Dec 2002 20:02:59 -0500 Received: from zack by egil.codesourcery.com with local (Exim 3.36 #1 (Debian)) id 18J1Sg-0004Qt-00; Mon, 02 Dec 2002 17:02:54 -0800 To: Per Bothner Cc: gcc@gnu.org Subject: Re: gcc branches? References: <3DEBFF1F.8070603@bothner.com> From: Zack Weinberg Date: Mon, 02 Dec 2002 17:04:00 -0000 In-Reply-To: <3DEBFF1F.8070603@bothner.com> (Per Bothner's message of "Mon, 02 Dec 2002 16:47:27 -0800") Message-ID: <87y97752yp.fsf@egil.codesourcery.com> User-Agent: Gnus/5.090008 (Oort Gnus v0.08) Emacs/21.2 (i386-pc-linux-gnu) MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Spam-Status: No, hits=-6.6 required=5.0 tests=EMAIL_ATTRIBUTION,IN_REP_TO,REFERENCES,SPAM_PHRASE_00_01, USER_AGENT version=2.41 X-Spam-Level: X-SW-Source: 2002-12/txt/msg00092.txt.bz2 Per Bothner writes: > Will someone automatically merge in changes from the 3.4 > branch into the trunk, or are each of us responsible for > our own merges? I hope the former, though if there are > any conflicts that may be difficult. I have been doing trunk->branch merges all along, and I intend to merge the entire branch back to the trunk at once, shortly after the 3.3 branch is created. It will need testing though. (I've got x86, sparc, and hppa test platforms lined up; other architectures would be helpful.) zw