| Submitter | Stefan Schmidt |
|---|---|
| Date | May 9, 2011, 7:29 a.m. |
| Message ID | <dda8ff6c3b7e006ed3114bc7de15dbf8b1742313.1304925139.git.stefan@buglabs.net> |
| Download | mbox | patch |
| Permalink | /patch/3463/ |
| State | Accepted |
| Headers | show |
Comments
Dear Stefan, Am Montag, den 09.05.2011, 09:29 +0200 schrieb Stefan Schmidt: > From: Stefan Schmidt <stefan@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? […] Thanks, Paul
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@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
Dear Stefan, Am Montag, den 09.05.2011, 11:13 +0200 schrieb Stefan Schmidt: > 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@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. thank you for the clarification. I guess the commit id of the borked commit would be handy too. > Normally I squash and rebase a lot on non-public or temp branches. :) It is a great feature! Thanks, Paul
Patch
diff --git a/recipes/icedtea/icedtea6-native_1.7.10.bb b/recipes/icedtea/icedtea6-native_1.7.10.bb index c55e197..77c6232 100644 --- a/recipes/icedtea/icedtea6-native_1.7.10.bb +++ b/recipes/icedtea/icedtea6-native_1.7.10.bb @@ -33,5 +33,4 @@ export DISTRIBUTION_PATCHES = "\ patches/icedtea-hotspot-make-arch-sane-for-x86.patch \ patches/icedtea-jdk-sane-x86-arch.patch \ patches/icedtea-unbreak-float.patch \ - patches/icedtea-jdk-build-sizer-32-on-amd64.patch \ "