From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 22929 invoked by alias); 24 Jan 2014 15:49:18 -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 22913 invoked by uid 89); 24 Jan 2014 15:49:17 -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,FREEMAIL_FROM,RCVD_IN_DNSWL_LOW,SPF_PASS autolearn=ham version=3.3.2 X-HELO: mail-oa0-f41.google.com Received: from mail-oa0-f41.google.com (HELO mail-oa0-f41.google.com) (209.85.219.41) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with (AES128-SHA encrypted) ESMTPS; Fri, 24 Jan 2014 15:49:10 +0000 Received: by mail-oa0-f41.google.com with SMTP id j17so3994146oag.0 for ; Fri, 24 Jan 2014 07:49:09 -0800 (PST) MIME-Version: 1.0 X-Received: by 10.182.230.135 with SMTP id sy7mr12826946obc.24.1390578549095; Fri, 24 Jan 2014 07:49:09 -0800 (PST) Received: by 10.76.105.174 with HTTP; Fri, 24 Jan 2014 07:49:08 -0800 (PST) In-Reply-To: <83ob31crka.fsf@gnu.org> References: <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> <8361p9ehht.fsf@gnu.org> <20140124115548.GO4762@adacore.com> <83wqhpcv4z.fsf@gnu.org> <83ob31crka.fsf@gnu.org> Date: Fri, 24 Jan 2014 15:49:00 -0000 Message-ID: Subject: Re: reject merges on gdb release branches? From: "H.J. Lu" To: Eli Zaretskii Cc: Joel Brobecker , Will Newton , ricard.wanderlof@axis.com, GDB Content-Type: text/plain; charset=ISO-8859-1 X-IsSubscribed: yes X-SW-Source: 2014-01/txt/msg00943.txt.bz2 On Fri, Jan 24, 2014 at 7:44 AM, Eli Zaretskii wrote: >> Date: Fri, 24 Jan 2014 06:45:11 -0800 >> From: "H.J. Lu" >> Cc: Joel Brobecker , Will Newton , >> ricard.wanderlof@axis.com, GDB >> >> 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. How can you do "git bisect" with merged commits? I know I can't do git bisect" on hjl/linux/applied branch since I use merge on it. -- H.J.