Cherry Picking git Patches and ChangeLog

Cherry Picking git Patches and ChangeLog

[Joel Sherrill]

Hi

We (RTEMS) have a series of patches from Jiri Gaisler that we
want to provide against the latest release. They were committed
to the git head. Ideally we should just be able to apply them
to the 7.9 release tarball, but the presence of ChangeLog entries
results in them not applying cleanly by patch as part of our
automated tool build process. We want to pull the patches directly
from upstream without adjusting them manually.

I know that this is really a git/ChangeLog/patch question but
since it comes up in context of gdb, I am asking here. How
does one deal with patches that would apply cleanly except
for ChangeLog?

FWIW If there is a 7.9.1, we would appreciate Jiri's sim/erc32 patches
to be in it.

Thanks.

--joel sherrill
RTEMS

Re: Cherry Picking git Patches and ChangeLog

[Andreas Schwab]

Joel Sherrill <joel.sherrill@oarcorp.com> writes:

> I know that this is really a git/ChangeLog/patch question but
> since it comes up in context of gdb, I am asking here. How
> does one deal with patches that would apply cleanly except
> for ChangeLog?

git-merge-changelog can help here.

Andreas.

-- 
Andreas Schwab, schwab@linux-m68k.org
GPG Key fingerprint = 58CA 54C7 6D53 942B 1756  01D3 44D5 214B 8276 4ED5
"And now for something completely different."

Re: Cherry Picking git Patches and ChangeLog

[Joel Sherrill]

On March 15, 2015 5:44:21 PM CDT, Andreas Schwab <schwab@linux-m68k.org> wrote:
>Joel Sherrill <joel.sherrill@oarcorp.com> writes:
>
>> I know that this is really a git/ChangeLog/patch question but
>> since it comes up in context of gdb, I am asking here. How
>> does one deal with patches that would apply cleanly except
>> for ChangeLog?
>
>git-merge-changelog can help here.

That will help if we want to manually touch the patches and update them for the tarball. 

Ideally we would just reference the upstream patch directly in the build system and let patch do it. We want this to be done as part of users building tools from source.

>Andreas.

--joel

Re: Cherry Picking git Patches and ChangeLog

[Andreas Schwab]

Joel Sherrill <joel.sherrill@oarcorp.com> writes:

> On March 15, 2015 5:44:21 PM CDT, Andreas Schwab <schwab@linux-m68k.org> wrote:
>>Joel Sherrill <joel.sherrill@oarcorp.com> writes:
>>
>>> I know that this is really a git/ChangeLog/patch question but
>>> since it comes up in context of gdb, I am asking here. How
>>> does one deal with patches that would apply cleanly except
>>> for ChangeLog?
>>
>>git-merge-changelog can help here.
>
> That will help if we want to manually touch the patches and update them for the tarball. 

Please explain what you are trying to do.  Cherry picking will use the
configured merge driver.

Andreas.

-- 
Andreas Schwab, schwab@linux-m68k.org
GPG Key fingerprint = 58CA 54C7 6D53 942B 1756  01D3 44D5 214B 8276 4ED5
"And now for something completely different."

Re: Cherry Picking git Patches and ChangeLog

[Joel Sherrill]

On 3/15/2015 6:03 PM, Andreas Schwab wrote:
> Joel Sherrill <joel.sherrill@oarcorp.com> writes:
>
>> On March 15, 2015 5:44:21 PM CDT, Andreas Schwab <schwab@linux-m68k.org> wrote:
>>> Joel Sherrill <joel.sherrill@oarcorp.com> writes:
>>>
>>>> I know that this is really a git/ChangeLog/patch question but
>>>> since it comes up in context of gdb, I am asking here. How
>>>> does one deal with patches that would apply cleanly except
>>>> for ChangeLog?
>>> git-merge-changelog can help here.
>> That will help if we want to manually touch the patches and update them for the tarball. 
> Please explain what you are trying to do.  Cherry picking will use the
> configured merge driver.
RTEMS has a Python based tool building framework similar to BSD ports.
It has a "recipe" to build a package like gcc, binutils, or gdb. We usually
start with a release tarball and apply patches. The patches can be from
RTEMS which aren't ready to be upstreamed or not merged upstream.
These patches are hosted on rtems.org in a special git repo.

But once they are merged, we like to fetch them from the upstream repo
or patch review system.

In this case, the patch directly extracted from git on the head doesn't
apply with patch to the contents of the release tarball.

I didn't see an option to patch to exclude some files so it seems like
the only option is to use git to cherry-pick the patches manually
and create a patch set.

We were trying to go directly from git/patchworks -> patch onto
contents from tar file.

Does that make sense?

> Andreas.
>

-- 
Joel Sherrill, Ph.D.             Director of Research & Development
joel.sherrill@OARcorp.com        On-Line Applications Research
Ask me about RTEMS: a free RTOS  Huntsville AL 35805
Support Available                (256) 722-9985

Re: Cherry Picking git Patches and ChangeLog

[Andreas Schwab]

Joel Sherrill <joel.sherrill@oarcorp.com> writes:

> We were trying to go directly from git/patchworks -> patch onto
> contents from tar file.

Use filterdiff.

Andreas.

-- 
Andreas Schwab, schwab@linux-m68k.org
GPG Key fingerprint = 58CA 54C7 6D53 942B 1756  01D3 44D5 214B 8276 4ED5
"And now for something completely different."