From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 28318 invoked by alias); 16 Dec 2002 08:11:47 -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 28311 invoked from network); 16 Dec 2002 08:11:46 -0000 Received: from unknown (HELO egil.codesourcery.com) (66.92.14.122) by sources.redhat.com with SMTP; 16 Dec 2002 08:11:46 -0000 Received: from zack by egil.codesourcery.com with local (Exim 3.36 #1 (Debian)) id 18NqLp-00054X-00; Mon, 16 Dec 2002 00:11:45 -0800 To: Mark Mitchell Cc: "gcc@gcc.gnu.org" Subject: Re: basic-improvements merge status References: <68770000.1040005587@warlock.codesourcery.com> From: Zack Weinberg Date: Mon, 16 Dec 2002 01:02:00 -0000 In-Reply-To: <68770000.1040005587@warlock.codesourcery.com> (Mark Mitchell's message of "Sun, 15 Dec 2002 18:26:27 -0800") Message-ID: <87n0n6xu0v.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-SW-Source: 2002-12/txt/msg00860.txt.bz2 Mark Mitchell writes: >> It is not clear to me that any purpose is served by holding off the >> merge to trunk until all these issues get resolved. We could instead >> do the merge now and fix the problems on the mainline; this would let >> people move forward with other work. It would probably be a good idea >> in that case to hold off on further branch merges and other massively >> destabilizing patches until these issues do get resolved. > > I agree. These are really problems that should have been detected > and fixed on BIB, but they slipped through. Nobody's fault, just > how it is. > > So, do the merge. Thanks for the vote of confidence ... ... but I just discovered that I don't know how. "cvs update -j gcc-3_4-basic-improvements-branch" tries to merge all of the merges from the trunk to the branch BACK into the trunk, causing a ton of spurious conflicts. What's the right way to do this? (I'm seriously considering "diff -ruN 3.3/ 3.4b/ | (cd top-of-trunk/ && patch -p1 -E"!) zw