From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 5782 invoked by alias); 10 Jun 2011 23:52:25 -0000 Received: (qmail 5773 invoked by uid 22791); 10 Jun 2011 23:52:25 -0000 X-SWARE-Spam-Status: No, hits=-2.1 required=5.0 tests=AWL,BAYES_00,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,SPF_HELO_PASS,TW_SV,T_RP_MATCHES_RCVD 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; Fri, 10 Jun 2011 23:52:07 +0000 Received: from kpbe11.cbf.corp.google.com (kpbe11.cbf.corp.google.com [172.25.105.75]) by smtp-out.google.com with ESMTP id p5ANq6TN011533 for ; Fri, 10 Jun 2011 16:52:06 -0700 Received: from yib18 (yib18.prod.google.com [10.243.65.82]) by kpbe11.cbf.corp.google.com with ESMTP id p5ANpZvf000579 (version=TLSv1/SSLv3 cipher=RC4-SHA bits=128 verify=NOT) for ; Fri, 10 Jun 2011 16:52:05 -0700 Received: by yib18 with SMTP id 18so1286190yib.3 for ; Fri, 10 Jun 2011 16:52:04 -0700 (PDT) MIME-Version: 1.0 Received: by 10.150.141.10 with SMTP id o10mr3682752ybd.70.1307749924821; Fri, 10 Jun 2011 16:52:04 -0700 (PDT) Received: by 10.151.142.15 with HTTP; Fri, 10 Jun 2011 16:52:04 -0700 (PDT) In-Reply-To: <20110610234839.264551E81AF@cgda.mtv.corp.google.com> References: <20110610234839.264551E81AF@cgda.mtv.corp.google.com> Date: Sat, 11 Jun 2011 05:16:00 -0000 Message-ID: Subject: Re: [google/gcc-4_6] merge google/main r174890 to google/gcc-4_6 branch (issue4576055) From: Diego Novillo To: Chris Demetriou Cc: reply@codereview.appspotmail.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-06/txt/msg00890.txt.bz2 On Fri, Jun 10, 2011 at 16:48, Chris Demetriou wrote: > testing with a native bootstrap, not quite done yet but since there were > no conflicts (except for the ChangeLog) it'll be fine. > > OK for google/gcc-4_6 assuming tests pass? OK. > (Note that the properties changes were generated by svnmerge.py, and > TBH I have *no idea* what some of them are about.) Yeah, this is because we are doing multi-way merges. gcc-4-6_branch and google/main have different svn properties in a couple of files. It's harmless. Diego.