From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 85316 invoked by alias); 18 Jun 2015 14:20:30 -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 85304 invoked by uid 89); 18 Jun 2015 14:20:29 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-2.7 required=5.0 tests=AWL,BAYES_00,RCVD_IN_DNSWL_LOW,RP_MATCHES_RCVD,SPF_PASS autolearn=ham version=3.3.2 X-HELO: mail-oi0-f47.google.com Received: from mail-oi0-f47.google.com (HELO mail-oi0-f47.google.com) (209.85.218.47) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with (AES128-GCM-SHA256 encrypted) ESMTPS; Thu, 18 Jun 2015 14:20:27 +0000 Received: by oigx81 with SMTP id x81so58463436oig.1 for ; Thu, 18 Jun 2015 07:20:25 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:in-reply-to:references:date :message-id:subject:from:to:cc:content-type; bh=GLd7OpeMaHmPOztUdgobslcUgLhMcauosCWux9qk0mg=; b=HzfOevNwC5UWmGprRX+mjpxHiiXce3dir+1xOiULdlREAprFRWB0mjyhpx1W3XLWGI 1dSldIEhavvKjcr/Nrmn14nbdiLk1/ASwCKBCxkWNeLJYAVsRqFyyqFayop3G0XrY+Lh nn41MTxd6mCGTcbi5zVq5LzMjOjmNr506S7RbJTjjYX/0iW2+KQ0BMEtvAZmm7DL6oSk sEwujqUsx0138NYYcMxxD3XxbYB6K0bMlhPfc2lIVgPFO420BpWZ/0WcE80x7Z3tM5pa wYuwpUUqp3IUYb4fBo2dzRZhMRcJAuuu+qZ3xaScvyvmASnrH/p0RfiMel6A0QtiXjf5 GvrQ== X-Gm-Message-State: ALoCoQkadQi5P06FOlQKPaKtiUQUnudtWGB5SsBBchHGkeIcXtmZSowJN3dBCubi39fyS2hiGh5n MIME-Version: 1.0 X-Received: by 10.202.80.204 with SMTP id e195mr8800713oib.116.1434637225188; Thu, 18 Jun 2015 07:20:25 -0700 (PDT) Received: by 10.182.89.99 with HTTP; Thu, 18 Jun 2015 07:20:25 -0700 (PDT) In-Reply-To: <5582D0A4.6010606@redhat.com> References: <1431562331-20448-1-git-send-email-patrick@parcs.ath.cx> <20150516152514.GA12510@host1.jankratochvil.net> <55829FE7.1060908@redhat.com> <5582D0A4.6010606@redhat.com> Date: Thu, 18 Jun 2015 14:20:00 -0000 Message-ID: Subject: Re: [PATCH] [RFC] Sync readline to version 6.3 patchlevel 8 From: Doug Evans To: Pedro Alves Cc: Jan Kratochvil , Patrick Palka , gdb-patches Content-Type: text/plain; charset=UTF-8 X-IsSubscribed: yes X-SW-Source: 2015-06/txt/msg00390.txt.bz2 On Thu, Jun 18, 2015 at 9:07 AM, Pedro Alves wrote: > 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? Can't think of anything.