Mirror of the gdb-patches mailing list
 help / color / mirror / Atom feed
From: Doug Evans <xdje42@gmail.com>
To: Eli Zaretskii <eliz@gnu.org>
Cc: Ricard Wanderlof <ricard.wanderlof@axis.com>,
	brobecker@adacore.com,
		"gdb-patches@sourceware.org" <gdb-patches@sourceware.org>
Subject: Re: reject merges on gdb release branches?
Date: Fri, 24 Jan 2014 08:07:00 -0000	[thread overview]
Message-ID: <CAP9bCMTRYiAyc9V9cVeOLR8fC-Yf_G0SkME7jXNCZSWnTQkCiw@mail.gmail.com> (raw)
In-Reply-To: <83ha8tersb.fsf@gnu.org>

On Thu, Jan 23, 2014 at 11:57 PM, Eli Zaretskii <eliz@gnu.org> wrote:
>> Date: Fri, 24 Jan 2014 08:36:25 +0100
>> From: Ricard Wanderlof <ricard.wanderlof@axis.com>
>> CC: "brobecker@adacore.com" <brobecker@adacore.com>,
>>       "gdb-patches@sourceware.org" <gdb-patches@sourceware.org>
>>
>> On Thu, 23 Jan 2014, Eli Zaretskii wrote:
>>
>> >>
>> >> I think it's not the merging per se that is a problem, only if it is done
>> >> incorrectly, i.e. merging from a branch that was was broken off from
>> >> master a long time ago, which brings in a lot of unwanted stuff.
>> >
>> > There's any number of ways one can make a mistake and screw up master.
>> > That cannot be the reason for forcing a particular workflow on
>> > everyone, certainly not before any such problems actually happened
>> > even once.
>> >
>> > And I don't understand your fear of unwanted stuff from a divergent
>> > branch: what exactly is special about this situation?  Surely,
>> > examining the diffs before committing and pushing would show what is
>> > about to land on master, so where's the danger that doesn't exist in
>> > any other commit?
>>
>> I'm not trying to advocate one or the other, rather just trying to
>> understand the reasoning behind the decision.
>
> So am I.  And I still don't understand that reasoning.
>
> Let me turn the table and ask: are there any objections to removing
> this restriction on master, and leaving it only on the branch?  If
> there are no objections, can we please remove the restriction?

fwiw, for now at least this git newbie likes the restriction on master
and release branches.


  reply	other threads:[~2014-01-24  8:07 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
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 [this message]
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=CAP9bCMTRYiAyc9V9cVeOLR8fC-Yf_G0SkME7jXNCZSWnTQkCiw@mail.gmail.com \
    --to=xdje42@gmail.com \
    --cc=brobecker@adacore.com \
    --cc=eliz@gnu.org \
    --cc=gdb-patches@sourceware.org \
    --cc=ricard.wanderlof@axis.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