From: Diego Novillo <dnovillo@google.com>
To: Chris Demetriou <cgd@google.com>
Cc: reply@codereview.appspotmail.com, gcc-patches@gcc.gnu.org
Subject: Re: [google/gcc-4_6] merge google/main r174890 to google/gcc-4_6 branch (issue4576055)
Date: Sat, 11 Jun 2011 05:16:00 -0000 [thread overview]
Message-ID: <BANLkTimYee3qYEH2RVF3PBxN2Uzd=kAe9g@mail.gmail.com> (raw)
In-Reply-To: <20110610234839.264551E81AF@cgda.mtv.corp.google.com>
On Fri, Jun 10, 2011 at 16:48, Chris Demetriou <cgd@google.com> 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.
prev parent reply other threads:[~2011-06-10 23:52 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-06-10 23:56 Chris Demetriou
2011-06-11 5:16 ` Diego Novillo [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to='BANLkTimYee3qYEH2RVF3PBxN2Uzd=kAe9g@mail.gmail.com' \
--to=dnovillo@google.com \
--cc=cgd@google.com \
--cc=gcc-patches@gcc.gnu.org \
--cc=reply@codereview.appspotmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).