From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 122750 invoked by alias); 18 Jun 2015 13:47:13 -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 122730 invoked by uid 89); 18 Jun 2015 13:47:11 -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-ob0-f172.google.com Received: from mail-ob0-f172.google.com (HELO mail-ob0-f172.google.com) (209.85.214.172) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with (AES128-GCM-SHA256 encrypted) ESMTPS; Thu, 18 Jun 2015 13:47:10 +0000 Received: by obctg8 with SMTP id tg8so54482935obc.3 for ; Thu, 18 Jun 2015 06:47:08 -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=zHtF1JULdATk8nZiXH7hlo0AZh07fkK1wCaMdIbtW/Y=; b=hYBdqe5Z73TuAJd9jo2x6NPYKg/Sj77at4bLB9KMua6ijBm3d1n/ntxZEH+6BfppSN sIQr4rNs20hiCWdklbLzyAEMuIXXWXNgedBsaXULux9dKb3Eo1tdWa21mH1GlTF7vua4 zGWfnw0YsTpYHej68tSbfyFBtG9YvxmL8/kNclnwNdS7A3pv+raFZ93ZwxiLgYSX22GX nYJVKUVeBan+JlcsY7k0BKM0+b1neiTLwXxcJDjnJo24Z3q7n6kDxkBEUiNO8pv+QWB3 3iVjCmnmo50UHILhyXTN+MzMT2e14HT9a2nEQ37wNyiL5qWhp+/V7i0q7ym0GmxqVP/0 EOrg== X-Gm-Message-State: ALoCoQlbNb8jdc5ej534s5EbysEYkvfG3KdjHFzaXap5d2W8JgbI6rHOJpw40KS7UjUhqmuXpKJ+ MIME-Version: 1.0 X-Received: by 10.60.155.97 with SMTP id vv1mr9166465oeb.15.1434635228552; Thu, 18 Jun 2015 06:47:08 -0700 (PDT) Received: by 10.182.89.99 with HTTP; Thu, 18 Jun 2015 06:47:08 -0700 (PDT) In-Reply-To: <55829FE7.1060908@redhat.com> References: <1431562331-20448-1-git-send-email-patrick@parcs.ath.cx> <20150516152514.GA12510@host1.jankratochvil.net> <55829FE7.1060908@redhat.com> Date: Thu, 18 Jun 2015 13:47: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/msg00388.txt.bz2 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]