future merge

[Mike Frysinger]

On Wed, Jun 8, 2011 at 17:17, Bernhard Reutner-Fischer wrote:
> master is now potentially open to
> - merge future into master
> - merge prelink into master
> - merge ldso-future into master
> (in this order).
>
> To do this, ideally one would bring future up to date, then merge it
> back into master etc.
>
> Peter, do you see fit to
> $ git checkout future
> $ git pull --rebase (provided future is a proper tracking branch)
> $ git push -v
> $ git checkout master
> $ git merge origin/future
> # edit
> $ git add some/thing
> $ git commit -s some/thing
> etc, etc?
>
> Current future would most likely conflict in e.g. longjmp impl i.e.
> would need to be resolved after such merge (and i didn't look, TBH).
>
> Any takers? Khem, do you have time to explain and resolve that with
> peter? Anybody else?

as long as the crap is pruned out (things like wrong commits that are
later reverted) ... i'd also like to see partial/broken commits get
squashed together.
-mike