[haskell-llvm] Towards 0.10

[Mark Wright]

On Mon, 18 Jul 2011 11:44:51 +0200, Vo Minh Thu <noteed at gmail.com> wrote:
> 2011/7/18 Henning Thielemann <lemming at henning-thielemann.de>:
> >
> > On Mon, 18 Jul 2011, Henning Thielemann wrote:
> >
> >> On Mon, 18 Jul 2011, Henning Thielemann wrote:
> >>>
> >>> I have prepared a patch for this purpose:
> >>>
> >>>  https://github.com/thielema/llvm/commit/86d5efa0ab8ffe7fcab078bef5391a6c85171860
> >>>
> >>> However, you still need to rerun autoconf.
> >>
> >> Sorry, this does not work, there is a 'lib' prefix left ... I'll fix that.
> >
> >
> > Dear git experts, what to do now? Shall I replace that patch by a corrected
> > one, or shall I prepare another patch? If I choose the first way, how can I
> > get rid of the currently wrong patch at github/thielema or how can I update
> > it?
> 
> If you have pushed a commit to a shared repo, don't get rid of the patch.
> The mistake is part of the history, but it's not a problem (except for
> your ego :) ).
> 
> Cheers,
> Thu

Its only a pull request on github though.  My experience is that
you can do evil things like:

add another commit

use: git rebase -i
then squash the commits together into one commit

rebase it onto head:

git fetch upstream
git rebase upstream/master

yes that rewrites history in your fork, as Thu points out you can only
do that before the pull request is merged.

then you can just push it again into your fork on github, this
updates the existing pull request automatically.

If it gives an error you can use something like (best to make sure the
pull request is not merged first, the first 2 are to make sure its up
to date):

git fetch upstream
git rebase upstream/master
git push -force origin master

where origin is the remote you have configured for your fork in
.git/config

Thanks, Mark