This is the mail archive of the
gdb-patches@sourceware.org
mailing list for the GDB project.
Re: [PATCH] [RFC] Sync readline to version 6.3 patchlevel 8
- From: Pedro Alves <palves at redhat dot com>
- To: Doug Evans <dje at google dot com>
- Cc: Jan Kratochvil <jan dot kratochvil at redhat dot com>, Patrick Palka <patrick at parcs dot ath dot cx>, gdb-patches <gdb-patches at sourceware dot org>
- Date: Thu, 18 Jun 2015 15:07:32 +0100
- Subject: Re: [PATCH] [RFC] Sync readline to version 6.3 patchlevel 8
- Authentication-results: sourceware.org; auth=none
- References: <1431562331-20448-1-git-send-email-patrick at parcs dot ath dot cx> <CADPb22RQi=S3ygBGL-b5+XD=Eyz+aKeQXmjE+5iSiazA-=4M7Q at mail dot gmail dot com> <CA+C-WL9Nqa7G4Wh1kszePEjQ5HwFNT5MsX+J5GFCswNDY1GPVQ at mail dot gmail dot com> <CADPb22SQpS1qwJ-uWQ+=JC-Z62YQBY9xGjxMRpx-2oEQHMuyiA at mail dot gmail dot com> <20150516152514 dot GA12510 at host1 dot jankratochvil dot net> <CADPb22RM_eoDuOMi-t01A5gJUme5uYf+MfvvbDJzASieqETKEg at mail dot gmail dot com> <55829FE7 dot 1060908 at redhat dot com> <CADPb22TYrdT1s93qjx3BmuQ5qzyrDJa5ySAmq3ck=47en-tbrw at mail dot gmail dot com>
On 06/18/2015 02:47 PM, Doug Evans wrote:
> On Thu, Jun 18, 2015 at 5:39 AM, Pedro Alves <palves@redhat.com> wrote:
>> On 05/16/2015 04:51 PM, Doug Evans wrote:
>>> On Sat, May 16, 2015 at 8:25 AM, Jan Kratochvil
>>> <jan.kratochvil@redhat.com> 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