From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 31278 invoked by alias); 16 Dec 2002 16:32:34 -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 31254 invoked from network); 16 Dec 2002 16:32:31 -0000 Received: from unknown (HELO yeah-baby.shagadelic.org) (208.176.2.162) by sources.redhat.com with SMTP; 16 Dec 2002 16:32:31 -0000 Received: by yeah-baby.shagadelic.org (Postfix, from userid 2158) id A00EA7DB1; Mon, 16 Dec 2002 08:32:30 -0800 (PST) Date: Mon, 16 Dec 2002 08:46:00 -0000 From: Jason R Thorpe To: Zack Weinberg Cc: Mark Mitchell , "gcc@gcc.gnu.org" Subject: Re: basic-improvements merge status Message-ID: <20021216163230.GD29324@yeah-baby.shagadelic.org> Mail-Followup-To: Jason R Thorpe , Zack Weinberg , Mark Mitchell , "gcc@gcc.gnu.org" References: <68770000.1040005587@warlock.codesourcery.com> <87n0n6xu0v.fsf@egil.codesourcery.com> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <87n0n6xu0v.fsf@egil.codesourcery.com> User-Agent: Mutt/1.4i Organization: Wasabi Systems, Inc. X-SW-Source: 2002-12/txt/msg00887.txt.bz2 On Mon, Dec 16, 2002 at 12:11:44AM -0800, Zack Weinberg wrote: > ... 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"!) I think you want to use the tag indicating the version of the trunk at the last merge with the branch tag, like so: -j version_of_trunk_at_least_merge -j gcc-3_4-basic-improvements-branch (sorry, I don't have that tag handy, because the system with my GCC source tree is powered off at the moment :-) ...because what you want to merge is "all of the differences between the trunk(at that time) and the branch". -- -- Jason R. Thorpe