From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 25718 invoked by alias); 24 Jan 2014 07:36:34 -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 25704 invoked by uid 89); 24 Jan 2014 07:36:33 -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,RP_MATCHES_RCVD,SPF_PASS autolearn=ham version=3.3.2 X-HELO: ra.se.axis.com Received: from ra.se.axis.com (HELO ra.se.axis.com) (195.60.68.10) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Fri, 24 Jan 2014 07:36:30 +0000 Received: from localhost (localhost [127.0.0.1]) by ra.se.axis.com (Postfix) with ESMTP id 4C4E23F20D9; Fri, 24 Jan 2014 08:36:27 +0100 (CET) Received: from ra.se.axis.com ([127.0.0.1]) by localhost (ra.se.axis.com [127.0.0.1]) (amavisd-new, port 10024) with LMTP id GXZFP+PaHHUN; Fri, 24 Jan 2014 08:36:26 +0100 (CET) Received: from boulder.se.axis.com (boulder.se.axis.com [10.0.2.104]) by ra.se.axis.com (Postfix) with ESMTP id 1764E3F20D4; Fri, 24 Jan 2014 08:36:25 +0100 (CET) Received: from boulder.se.axis.com (localhost [127.0.0.1]) by postfix.imss71 (Postfix) with ESMTP id C8CF0BB4; Fri, 24 Jan 2014 08:36:25 +0100 (CET) Received: from seth.se.axis.com (seth.se.axis.com [10.0.2.172]) by boulder.se.axis.com (Postfix) with ESMTP id BC478BB2; Fri, 24 Jan 2014 08:36:25 +0100 (CET) Received: from xmail2.se.axis.com (xmail2.se.axis.com [10.0.5.74]) by seth.se.axis.com (Postfix) with ESMTP id B87163E06F; Fri, 24 Jan 2014 08:36:25 +0100 (CET) Received: from lnxricardw.se.axis.com (10.88.7.1) by xmail2.se.axis.com (10.0.5.74) with Microsoft SMTP Server (TLS) id 8.2.255.0; Fri, 24 Jan 2014 08:36:25 +0100 Date: Fri, 24 Jan 2014 07:36:00 -0000 From: Ricard Wanderlof To: Eli Zaretskii CC: "brobecker@adacore.com" , "gdb-patches@sourceware.org" Subject: Re: reject merges on gdb release branches? In-Reply-To: <83wqhqekpp.fsf@gnu.org> Message-ID: References: <20140122051133.GB4762@adacore.com> <83r480f2r2.fsf@gnu.org> <20140122161520.GF4762@adacore.com> <83bnz4ezst.fsf@gnu.org> <83wqhqekpp.fsf@gnu.org> User-Agent: Alpine 2.00 (DEB 1167 2008-08-23) MIME-Version: 1.0 Content-Type: text/plain; charset="iso-8859-1"; format=flowed Content-Transfer-Encoding: 8BIT X-SW-Source: 2014-01/txt/msg00914.txt.bz2 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. Personally I always check what I've got locally with gitk or other tool which provides an overview of what I'm about to push before I do it. I agree that there are more than one way to screw up a master, still, it would be prudent to gain from the experience of other similar projects even though nothing bad has happened with gdb yet (very likely owing to the fact that gdb has only been using git for a couple of months). > Again, I can understand that some people are accustomed to rebasing, > and I'm okay with that. But I don't understand why something that is > essentially a matter of personal preferences is forced on everyone. > /Ricard -- Ricard Wolf Wanderlöf ricardw(at)axis.com Axis Communications AB, Lund, Sweden www.axis.com Phone +46 46 272 2016 Fax +46 46 13 61 30