From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 26584 invoked by alias); 14 Jul 2011 19:49:10 -0000 Received: (qmail 26576 invoked by uid 22791); 14 Jul 2011 19:49:09 -0000 X-SWARE-Spam-Status: No, hits=-2.1 required=5.0 tests=AWL,BAYES_00,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,RP_MATCHES_RCVD,SPF_HELO_PASS,TW_SV X-Spam-Check-By: sourceware.org Received: from smtp-out.google.com (HELO smtp-out.google.com) (216.239.44.51) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Thu, 14 Jul 2011 19:48:39 +0000 Received: from wpaz29.hot.corp.google.com (wpaz29.hot.corp.google.com [172.24.198.93]) by smtp-out.google.com with ESMTP id p6EJmdPN031150 for ; Thu, 14 Jul 2011 12:48:39 -0700 Received: from gxk2 (gxk2.prod.google.com [10.202.11.2]) by wpaz29.hot.corp.google.com with ESMTP id p6EJmFPo029253 (version=TLSv1/SSLv3 cipher=RC4-SHA bits=128 verify=NOT) for ; Thu, 14 Jul 2011 12:48:38 -0700 Received: by gxk2 with SMTP id 2so291827gxk.36 for ; Thu, 14 Jul 2011 12:48:37 -0700 (PDT) MIME-Version: 1.0 Received: by 10.100.55.33 with SMTP id d33mr2569846ana.151.1310672917672; Thu, 14 Jul 2011 12:48:37 -0700 (PDT) Received: by 10.101.136.9 with HTTP; Thu, 14 Jul 2011 12:48:37 -0700 (PDT) In-Reply-To: References: <20110713071242.DCBB42140E@guozhiwei.sha.corp.google.com> Date: Thu, 14 Jul 2011 20:34:00 -0000 Message-ID: Subject: Re: [google] Backport patch r175881 from gcc-4_6-branch to google/gcc-4_6 (issue4695051) From: Diego Novillo To: Carrot Wei Cc: reply@codereview.appspotmail.com, davidxl@google.com, dougkwan@google.com, gcc-patches@gcc.gnu.org Content-Type: text/plain; charset=UTF-8 X-System-Of-Record: true 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: 2011-07/txt/msg01193.txt.bz2 On Wed, Jul 13, 2011 at 22:39, Carrot Wei wrote: > Hi Diego > > The previous patch was done with svn merge. > > This new version is done with svnmerge.py. Again tested with Great, thanks. This simplifies regular merges, since svnmerge.py will know that this rev was merged already. I think svnmerge.py also reads 'svn merge' markers, but I'm not sure. > make check-g++ RUNTESTFLAGS="--target_board=arm-sim/thumb/arch=armv7-a > dg.exp=anon-ns1.C" > make check-g++ RUNTESTFLAGS="dg.exp=anon-ns1.C" > > BTW, there are some unexpected property changes after merge, I don't > how did they come out and how should I deal with them? Don't worry about those. The branch used to merge from multiple sources that had different attributes for those files. It will be gone after the next merge I'm doing next week. The backport is OK, of course. Diego.