public inbox for [email protected]
help / color / mirror / Atom feedFrom: Alvaro Herrera <[email protected]>
To: Magnus Hagander <[email protected]>
Cc: Andres Freund <[email protected]>
Cc: Tom Lane <[email protected]>
Cc: Kevin Grittner <[email protected]>
Cc: Peter Eisentraut <[email protected]>
Cc: PostgreSQL WWW <[email protected]>
Cc: Stephen Frost <[email protected]>
Subject: Re: gitweb is no longer a real-time view
Date: Mon, 4 Mar 2013 12:05:22 -0300
Message-ID: <[email protected]> (raw)
In-Reply-To: <CABUevExXiYKsnLqOAapR1ixph=Y38UVFoqZm8cSzuFZpcW3d3A@mail.gmail.com>
References: <[email protected]>
<[email protected]>
<[email protected]>
<[email protected]>
<CABUevEwfw24iF9-czueLSmdFQwck012qfVmLXcoKbG37xG56jQ@mail.gmail.com>
<CABUevEzM2F8qAxVds9Me-41L5BqeEGO4DuosCQhC0C6v05HPUw@mail.gmail.com>
<[email protected]>
<CABUevExXiYKsnLqOAapR1ixph=Y38UVFoqZm8cSzuFZpcW3d3A@mail.gmail.com>
List-Unsubscribe: <mailto:[email protected]?body=unsub%20pgsql-www>
Magnus Hagander wrote:
> On Mon, Mar 4, 2013 at 1:50 PM, Andres Freund <[email protected]> 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?
Uh, 3bf3ab8c5 is parent of bc6187868 so surely you don't need to
cherry-pick that one? Only the other two.
--
Álvaro Herrera http://www.2ndQuadrant.com/
PostgreSQL Development, 24x7 Support, Training & Services
--
Sent via pgsql-www mailing list ([email protected])
To make changes to your subscription:
http://www.postgresql.org/mailpref/pgsql-www
view thread (43+ messages) latest in thread
reply
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Reply to all the recipients using the --to and --cc options:
reply via email
To: [email protected]
Cc: [email protected], [email protected], [email protected], [email protected], [email protected], [email protected], [email protected]
Subject: Re: gitweb is no longer a real-time view
In-Reply-To: <[email protected]>
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
This inbox is served by agora; see mirroring instructions
for how to clone and mirror all data and code used for this inbox