[oe] [PATCH 2011.03-maintenance 1/7] icedtea6-native_1.7.10: Remove reference to deleted patch.
Stefan Schmidt
stefan at datenfreihafen.org
Mon May 9 09:13:48 UTC 2011
Hello.
On Mon, 2011-05-09 at 10:56, Paul Menzel wrote:
>
> Am Montag, den 09.05.2011, 09:29 +0200 schrieb Stefan Schmidt:
> > From: Stefan Schmidt <stefan at buglabs.net>
> >
> > During my cherry-pick of Henning's patch from master I somehow b0rked the commit
> > by loosing this hunk that also deletes the reference to the deleted patch file.
>
> why is not it possible to fix the borked commit using `git rebase` or
> just squash this patch and Hennings and resend the pull request?
Because the broken commit was in my _last_ pull request which already
is pulled into the 2011.03 maintenance branch.
As this is a public branch we can't rebase it and thus I'm going with
an incremental fix. Hope that clears it up. Maybe the changelog should
have been more clear that I meant an old commit already sitting in the
tree.
Normally I squash and rebase a lot on non-public or temp branches. :)
regards
Stefan Schmidt
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 250 bytes
Desc: Digital signature
URL: <http://lists.openembedded.org/pipermail/openembedded-devel/attachments/20110509/ec777789/attachment-0002.sig>
More information about the Openembedded-devel
mailing list