From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 19061 invoked by alias); 24 Jan 2014 11:38:45 -0000 Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sourceware.org Received: (qmail 19045 invoked by uid 89); 24 Jan 2014 11:38:44 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-1.3 required=5.0 tests=AWL,BAYES_00 autolearn=ham version=3.3.2 X-HELO: rock.gnat.com Received: from rock.gnat.com (HELO rock.gnat.com) (205.232.38.15) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with (AES256-SHA encrypted) ESMTPS; Fri, 24 Jan 2014 11:38:43 +0000 Received: from localhost (localhost.localdomain [127.0.0.1]) by filtered-rock.gnat.com (Postfix) with ESMTP id D70B71165CE; Fri, 24 Jan 2014 06:38:41 -0500 (EST) Received: from rock.gnat.com ([127.0.0.1]) by localhost (rock.gnat.com [127.0.0.1]) (amavisd-new, port 10024) with LMTP id s+jh7fX92I9l; Fri, 24 Jan 2014 06:38:41 -0500 (EST) Received: from joel.gnat.com (localhost.localdomain [127.0.0.1]) by rock.gnat.com (Postfix) with ESMTP id 6C7671165C4; Fri, 24 Jan 2014 06:38:41 -0500 (EST) Received: by joel.gnat.com (Postfix, from userid 1000) id C753DE0EF0; Fri, 24 Jan 2014 15:38:43 +0400 (RET) Date: Fri, 24 Jan 2014 11:38:00 -0000 From: Joel Brobecker To: Eli Zaretskii Cc: will.newton@linaro.org, ricard.wanderlof@axis.com, gdb-patches@sourceware.org Subject: Re: reject merges on gdb release branches? Message-ID: <20140124113843.GA21300@adacore.com> References: <83ha8tersb.fsf@gnu.org> <20140124080703.GL4762@adacore.com> <83eh3xep43.fsf@gnu.org> <83a9eleksf.fsf@gnu.org> <838uu5eju2.fsf@gnu.org> <20140124105807.GM4762@adacore.com> <837g9peirg.fsf@gnu.org> <20140124113014.GN4762@adacore.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20140124113014.GN4762@adacore.com> User-Agent: Mutt/1.5.21 (2010-09-15) X-SW-Source: 2014-01/txt/msg00933.txt.bz2 [resending without the png attachement - the list rejects png] On Fri, Jan 24, 2014 at 03:30:14PM +0400, Joel Brobecker wrote: > > > If there are conflicts between your branch and the master branch, > > > and those conflicts are not trivial to resolve, the commits needs > > > to be reviewed again. > > > > Of course. I'm talking about the situation after they are resolved > > and the result is committed. > > So, concretely, you would also send the merge commit as an extra commit > for review? > > > > > Anyway, we are going in circles. I'm not trying to convince you to > > > > change your workflow, I'm asking to allow me to keep mine. > > > > > > But this is at the cost of everyone else finding it more difficult > > > afterwards each time they consult the history. > > > > What difficulty are you talking about? Can you demonstrate on a real > > history log that difficulty? > > Sure. Attached is a gittk screenshot. > > This discussion is taking more time than I have, unfortunately. > I'll probably let you guys discuss it out, and I will live with > the outcome. I'll have to say that this discussion did reinforce > my feeling that the current rule has more benefits than drawbacks. -- Joel