On Mon, Mar 4, 2013 at 1:50 PM, Andres Freund <andres@2ndquadrant.com> wrote:
> I think the most realistic way to resolve this is to push the current
> anongit state to master and cherry-pick
> bc61878682051678ade5f59da7bfd90ab72ce13b ontop it. That way only
> committers need to deal with rebasing their branches and not everyone
> else.
I satarted looking at doing this, but this is backwards, right?
Commit bc61878682051678ade5f59da7bfd90ab72ce13b exists on anongit, and
only there.
So what we need is to reset master HEAD to that of anongit, and then
cherrypick 3bf3ab8c563699138be02f9dc305b7b77a724307,
d63977eea3ab18fdec05e370b633d10b9fd20179 and
5db5974c692b0fc68e7608dd85a6b4e6173a0f28 on top of that, no?
--Magnus HaganderMe: http://www.hagander.net/Work: http://www.redpill-linpro.com/