From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 14520 invoked by alias); 22 Jan 2014 16:39:22 -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 14508 invoked by uid 89); 22 Jan 2014 16:39:21 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-3.0 required=5.0 tests=AWL,BAYES_00,RCVD_IN_DNSWL_NONE,SPF_SOFTFAIL autolearn=no version=3.3.2 X-HELO: mtaout20.012.net.il Received: from mtaout20.012.net.il (HELO mtaout20.012.net.il) (80.179.55.166) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Wed, 22 Jan 2014 16:39:19 +0000 Received: from conversion-daemon.a-mtaout20.012.net.il by a-mtaout20.012.net.il (HyperSendmail v2007.08) id <0MZT00L009SZ3B00@a-mtaout20.012.net.il> for gdb-patches@sourceware.org; Wed, 22 Jan 2014 18:39:17 +0200 (IST) Received: from HOME-C4E4A596F7 ([87.69.4.28]) by a-mtaout20.012.net.il (HyperSendmail v2007.08) with ESMTPA id <0MZT00KF9A9GYK60@a-mtaout20.012.net.il>; Wed, 22 Jan 2014 18:39:17 +0200 (IST) Date: Wed, 22 Jan 2014 16:39:00 -0000 From: Eli Zaretskii Subject: Re: reject merges on gdb release branches? In-reply-to: <20140122161520.GF4762@adacore.com> To: Joel Brobecker Cc: gdb-patches@sourceware.org Reply-to: Eli Zaretskii Message-id: <83bnz4ezst.fsf@gnu.org> References: <20140122051133.GB4762@adacore.com> <83r480f2r2.fsf@gnu.org> <20140122161520.GF4762@adacore.com> X-IsSubscribed: yes X-SW-Source: 2014-01/txt/msg00869.txt.bz2 > Date: Wed, 22 Jan 2014 20:15:20 +0400 > From: Joel Brobecker > Cc: gdb-patches@sourceware.org > > > 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? No, I'm asking specifically about the master branch of the GDB repository. (I understand the reasoning behind disallowing that for the release branch, given the practice that bugfixes get applied to master first.) > The currently situation, as discussed during the transition to git, > was that this is not allowed for the "master" branch. Where was that discussed, and what were the reasons? > Note that a rebase, compared to a merge, is not that much more work, > and has the nice property of keeping the history linear. Rebasing loses information (e.g., if I merged from master several times during my work). And I don't really see the downsides of merging to master. I also don't object if others want to rebase, I just don't understand why force everybody to do that. > It's something you do anyway in order to submit the patches ??? Why would I need to do that for submittal? Git is perfectly capable of diffing against any revision of any branch, right? > This proposal is to extend this restriction to all GDB release branches, I have nothing against that, I just didn't know about a similar restriction for master, and was unpleasantly surprised.