From: "H.J. Lu" <hjl.tools@gmail.com>
To: Joel Brobecker <brobecker@adacore.com>,
Binutils <binutils@sourceware.org>
Cc: Eli Zaretskii <eliz@gnu.org>, GDB <gdb-patches@sourceware.org>
Subject: Re: reject merges on gdb release branches?
Date: Wed, 22 Jan 2014 16:23:00 -0000 [thread overview]
Message-ID: <CAMe9rOqp-kVKanMD7Zhm2xJVEgMEBtXUKjQY9oNY54Zxat8_CQ@mail.gmail.com> (raw)
In-Reply-To: <20140122161520.GF4762@adacore.com>
On Wed, Jan 22, 2014 at 8:15 AM, Joel Brobecker <brobecker@adacore.com> wrote:
>> Doesn't that mean you are forcing everybody to rebase before
>> committing from feature branches? If so, that sounds drastic, and
>> should have very good reasons. (Apologies if this was already
>> discussed and decided, but in that case I'd appreciate a pointer.)
>
> IIUC, you're asking a general question: Is it OK to do a merge of
> a feature branch onto another, and then push that branch?
>
> The currently situation, as discussed during the transition to git,
> was that this is not allowed for the "master" branch. Note that
> a rebase, compared to a merge, is not that much more work, and has
> the nice property of keeping the history linear. I've been managing
> patch series of 20+ patches, with regular rebases, without problems.
> It's something you do anyway in order to submit the patches, so
> I don't think this is an issue in practice.
>
> This proposal is to extend this restriction to all GDB release branches,
> for the reasons detailed in my reply to Yao. Basically, this is to
> avoid mistakes resulting us in merging more than what you intended.
>
Add binutils mailing list.
I think it is a good idea and it should be extended to all binutils
release branches.
Thanks for doing this.
--
H.J.
next prev parent reply other threads:[~2014-01-22 16:23 UTC|newest]
Thread overview: 39+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-01-22 5:11 Joel Brobecker
2014-01-22 5:22 ` Doug Evans
2014-01-22 5:48 ` Yao Qi
2014-01-22 7:37 ` Joel Brobecker
2014-01-22 12:45 ` Yao Qi
2014-01-22 12:37 ` Pedro Alves
2014-01-22 15:35 ` Eli Zaretskii
2014-01-22 16:15 ` Joel Brobecker
2014-01-22 16:23 ` H.J. Lu [this message]
2014-01-22 16:39 ` Eli Zaretskii
2014-01-23 7:46 ` Ricard Wanderlof
2014-01-23 16:17 ` Eli Zaretskii
2014-01-24 7:36 ` Ricard Wanderlof
2014-01-24 7:56 ` Eli Zaretskii
2014-01-24 8:07 ` Doug Evans
2014-01-24 8:38 ` Eli Zaretskii
2014-01-24 8:07 ` Joel Brobecker
2014-01-24 8:54 ` Eli Zaretskii
2014-01-24 10:09 ` Will Newton
2014-01-24 10:28 ` Eli Zaretskii
2014-01-24 10:35 ` Will Newton
2014-01-24 10:48 ` Eli Zaretskii
2014-01-24 10:58 ` Joel Brobecker
2014-01-24 11:11 ` Eli Zaretskii
[not found] ` <20140124113014.GN4762@adacore.com>
2014-01-24 11:38 ` Joel Brobecker
2014-01-24 11:39 ` Eli Zaretskii
2014-01-24 11:55 ` Joel Brobecker
2014-01-24 14:27 ` Eli Zaretskii
2014-01-24 14:45 ` H.J. Lu
2014-01-24 15:44 ` Eli Zaretskii
2014-01-24 15:49 ` H.J. Lu
2014-01-24 16:02 ` Eli Zaretskii
2014-01-24 16:05 ` H.J. Lu
2014-01-24 16:18 ` Andreas Schwab
2014-01-22 16:07 ` Tom Tromey
2014-01-23 5:58 ` Joel Brobecker
2014-01-23 15:35 ` Tom Tromey
2014-01-24 2:18 ` Joel Brobecker
2014-01-24 3:06 ` Tom Tromey
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=CAMe9rOqp-kVKanMD7Zhm2xJVEgMEBtXUKjQY9oNY54Zxat8_CQ@mail.gmail.com \
--to=hjl.tools@gmail.com \
--cc=binutils@sourceware.org \
--cc=brobecker@adacore.com \
--cc=eliz@gnu.org \
--cc=gdb-patches@sourceware.org \
/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).