From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 19572 invoked by alias); 26 Sep 2010 16:18:21 -0000 Received: (qmail 19553 invoked by uid 22791); 26 Sep 2010 16:18:17 -0000 X-SWARE-Spam-Status: No, hits=2.1 required=5.0 tests=AWL,BAYES_20,RCVD_IN_BRBL_LASTEXT,RCVD_IN_PSBL,RCVD_IN_RP_RNBL,TW_SV,TW_VN X-Spam-Check-By: sourceware.org Received: from smtp-150-sunday.nerim.net (HELO maiev.nerim.net) (194.79.134.150) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Sun, 26 Sep 2010 16:18:11 +0000 Received: from hector.lesours (ours.starynkevitch.net [213.41.244.95]) by maiev.nerim.net (Postfix) with ESMTPS id 8F0722E00F; Sun, 26 Sep 2010 18:18:09 +0200 (CEST) Received: from glinka.lesours ([192.168.0.1] helo=glinka) by hector.lesours with smtp (Exim 4.72) (envelope-from ) id 1OztvV-000066-1z; Sun, 26 Sep 2010 18:18:09 +0200 Date: Mon, 27 Sep 2010 06:17:00 -0000 From: Basile Starynkevitch To: Jerry DeLisle Cc: gcc patches Subject: Re: Trunk merged into fortran-dev branch Message-Id: <20100926181758.4e2d9f6f.basile@starynkevitch.net> In-Reply-To: <4C9F6813.5040700@frontier.com> References: <4C9F6813.5040700@frontier.com> Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit X-IsSubscribed: yes Mailing-List: contact gcc-patches-help@gcc.gnu.org; run by ezmlm Precedence: bulk List-Id: List-Archive: List-Post: List-Help: Sender: gcc-patches-owner@gcc.gnu.org X-SW-Source: 2010-09/txt/msg02089.txt.bz2 On Sun, 26 Sep 2010 08:34:43 -0700 Jerry DeLisle wrote: > Merging r163873 through r164609 from trunk. What is the best way to merge the trunk into a branch? I regularily do svnmerge merge to merge trunk into GCC MELT, but sometimes strange things happens (i.e. I have to svn add new trunk files manually into GCC MELT). Very often, it is ok, but I don't understand when and how it goes wrong! So what tool or script or human procedure did you use to merge trunk into fortran-dev? Cheers -- Basile STARYNKEVITCH http://starynkevitch.net/Basile/ email: basilestarynkevitchnet mobile: +33 6 8501 2359 8, rue de la Faiencerie, 92340 Bourg La Reine, France *** opinions {are only mine, sont seulement les miennes} ***