Re: [PATCH v6 0/9] Python bindings for btrace recordings

Doug Evans
2017-02-14T16:22:25Z

On Tue, Feb 14, 2017 at 2:18 AM, Wiederhake, Tim
<tim.wiederhake@intel.com> wrote:
> Hi all,
>
>> > Is this good to go?
>> LGTM
>
> ... And in return I made a mess. What should have been a "git push --dry-run" to prepare for pushing this, ended up as an actual push. The commits now miss the actual ChangeLog entries and contain some "Change-Id" lines. Before I start fiddeling and probably make things worse, could you tell me how to properly resolve this?
>
> Thanks,
> Tim

Hi.
I suppose technically the Right thing to do is to revert it all and
recommit with the ChangeLog changes.
But it's not like we never make post-commit corrections to just ChangeLogs.
Perhaps not on this scale, but I'm totally ok with just ignoring the
Change-Id lines and adding the ChangeLog entries as a separate patch.