Re: [PATCH] [RFC] Sync readline to version 6.3 patchlevel 8

Pedro Alves
2015-06-18T14:08:24Z

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