From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 38924 invoked by alias); 18 Jun 2015 14:08:24 -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 38667 invoked by uid 89); 18 Jun 2015 14:07:37 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-1.5 required=5.0 tests=AWL,BAYES_00,KAM_LAZY_DOMAIN_SECURITY,RP_MATCHES_RCVD,SPF_HELO_PASS autolearn=no version=3.3.2 X-HELO: mx1.redhat.com Received: from mx1.redhat.com (HELO mx1.redhat.com) (209.132.183.28) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with (AES256-GCM-SHA384 encrypted) ESMTPS; Thu, 18 Jun 2015 14:07:36 +0000 Received: from int-mx09.intmail.prod.int.phx2.redhat.com (int-mx09.intmail.prod.int.phx2.redhat.com [10.5.11.22]) by mx1.redhat.com (Postfix) with ESMTPS id 63AD836509D; Thu, 18 Jun 2015 14:07:35 +0000 (UTC) Received: from [127.0.0.1] (ovpn01.gateway.prod.ext.ams2.redhat.com [10.39.146.11]) by int-mx09.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id t5IE7WOM020550; Thu, 18 Jun 2015 10:07:34 -0400 Message-ID: <5582D0A4.6010606@redhat.com> Date: Thu, 18 Jun 2015 14:08:00 -0000 From: Pedro Alves User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:31.0) Gecko/20100101 Thunderbird/31.5.0 MIME-Version: 1.0 To: Doug Evans CC: Jan Kratochvil , Patrick Palka , gdb-patches Subject: Re: [PATCH] [RFC] Sync readline to version 6.3 patchlevel 8 References: <1431562331-20448-1-git-send-email-patrick@parcs.ath.cx> <20150516152514.GA12510@host1.jankratochvil.net> <55829FE7.1060908@redhat.com> In-Reply-To: Content-Type: text/plain; charset=windows-1252 Content-Transfer-Encoding: 7bit X-SW-Source: 2015-06/txt/msg00389.txt.bz2 On 06/18/2015 02:47 PM, Doug Evans wrote: > On Thu, Jun 18, 2015 at 5:39 AM, Pedro Alves wrote: >> On 05/16/2015 04:51 PM, Doug Evans wrote: >>> On Sat, May 16, 2015 at 8:25 AM, Jan Kratochvil >>> wrote: >>>> On Sat, 16 May 2015 17:23:23 +0200, Doug Evans wrote: >>>>> Another thought is that IWBN if the reapplication of local patches was >>>>> a separate commit. >>>> >>>> IIUC this would break git bisect. >>> >>> It might. Bleah. >>> >>> What's the "git" way to do this (*1) that doesn't involve a lot of >>> manual effort? >>> --- >>> (*1): "this" being extracting out individual local patches later in >>> time (say a year from now). >> >> I guess that would be a git merge of the branch that contains >> the local patches. We don't allow merge commits in our >> repo though. >> >> I think that easiest next best is to put the unsquashed application >> of the local patches in a branch (just like users/ppalka/readline-6.3-update), >> and apply the squashed version to master. For the next update, we can >> find the initial local patches in the branch. > > fwiw, I'm not comfortable with needing to rely on personal branches > for pretty much anything. > > Can we make an official readline merging branch? > [assuming using a branch is how we want to solve this] Don't see why not. Is there more to it than picking a name? Thanks, Pedro Alves