From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <gdb-patches-return-109740-listarch-gdb-patches=sources.redhat.com@sourceware.org>
Received: (qmail 18634 invoked by alias); 24 Jan 2014 15:44:59 -0000
Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm
Precedence: bulk
List-Id: <gdb-patches.sourceware.org>
List-Subscribe: <mailto:gdb-patches-subscribe@sourceware.org>
List-Archive: <http://sourceware.org/ml/gdb-patches/>
List-Post: <mailto:gdb-patches@sourceware.org>
List-Help: <mailto:gdb-patches-help@sourceware.org>, <http://sourceware.org/ml/#faqs>
Sender: gdb-patches-owner@sourceware.org
Received: (qmail 18620 invoked by uid 89); 24 Jan 2014 15:44:58 -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; Fri, 24 Jan 2014 15:44:57 +0000
Received: from conversion-daemon.a-mtaout20.012.net.il by a-mtaout20.012.net.il (HyperSendmail v2007.08) id <0MZW00I00WZM0H00@a-mtaout20.012.net.il> for gdb-patches@sourceware.org; Fri, 24 Jan 2014 17:44:54 +0200 (IST)
Received: from HOME-C4E4A596F7 ([87.69.4.28]) by a-mtaout20.012.net.il (HyperSendmail v2007.08) with ESMTPA id <0MZW00ICHX2U0J00@a-mtaout20.012.net.il>; Fri, 24 Jan 2014 17:44:54 +0200 (IST)
Date: Fri, 24 Jan 2014 15:44:00 -0000
From: Eli Zaretskii <eliz@gnu.org>
Subject: Re: reject merges on gdb release branches?
In-reply-to: <CAMe9rOpU3QeMuNveNMYVXJh0xn+WG5eH-LLw7Gw7OLf8qj--Eg@mail.gmail.com>
To: "H.J. Lu" <hjl.tools@gmail.com>
Cc: brobecker@adacore.com, will.newton@linaro.org, ricard.wanderlof@axis.com, gdb-patches@sourceware.org
Reply-to: Eli Zaretskii <eliz@gnu.org>
Message-id: <83ob31crka.fsf@gnu.org>
References: <20140124080703.GL4762@adacore.com> <83eh3xep43.fsf@gnu.org> <CANu=DmhEyNvF3au1r+zyrZ2B368iA8PF3hh3cWMM2Hhwa1mpYw@mail.gmail.com> <83a9eleksf.fsf@gnu.org> <CANu=Dmh39cA462XRa=+254n3CwZ5M3peAQBhN-bhV6A6OuXuzQ@mail.gmail.com> <838uu5eju2.fsf@gnu.org> <20140124105807.GM4762@adacore.com> <837g9peirg.fsf@gnu.org> <20140124113014.GN4762@adacore.com> <8361p9ehht.fsf@gnu.org> <20140124115548.GO4762@adacore.com> <83wqhpcv4z.fsf@gnu.org> <CAMe9rOpU3QeMuNveNMYVXJh0xn+WG5eH-LLw7Gw7OLf8qj--Eg@mail.gmail.com>
X-IsSubscribed: yes
X-SW-Source: 2014-01/txt/msg00942.txt.bz2

> Date: Fri, 24 Jan 2014 06:45:11 -0800
> From: "H.J. Lu" <hjl.tools@gmail.com>
> Cc: Joel Brobecker <brobecker@adacore.com>, Will Newton <will.newton@linaro.org>, 
> 	ricard.wanderlof@axis.com, GDB <gdb-patches@sourceware.org>
> 
> I use both rebase and merge. I use merge on hjl/linux/master
> branch since I need to go back to checkout previous trees on
> my branch. Rebase won't work for me here.
> 
> But for hjl/mpx/pltext8 branch, I use rebase since I
> plan to commit it to master when the work is complete
> and I don't need to go back in history.
> 
> I don't care about the history of each commit on master
> and release branches.  Merge will only confuse me.
> But you can tag your merged commit before rebase or
> create a branch for it.  All history will be there for you
> and it won't confuse other people.

There's any number of workflows that git allows.  As long as master
only gets pushes that add commits, I don't see why we should force a
particular workflow and disallow all others.  You should be able to
use yours, and I should be able to use mine.  Sorry, but I refuse to
believe that people who develop and maintain GDB and Binutils are
confused by a DAG that has a few merges.