| From: | Alvaro Herrera <alvherre(at)2ndquadrant(dot)com> |
|---|---|
| To: | Magnus Hagander <magnus(at)hagander(dot)net> |
| Cc: | Andres Freund <andres(at)2ndquadrant(dot)com>, Tom Lane <tgl(at)sss(dot)pgh(dot)pa(dot)us>, Kevin Grittner <kgrittn(at)mail(dot)com>, Peter Eisentraut <peter_e(at)gmx(dot)net>, PostgreSQL WWW <pgsql-www(at)postgresql(dot)org>, Stephen Frost <sfrost(at)snowman(dot)net> |
| Subject: | Re: gitweb is no longer a real-time view |
| Date: | 2013-03-04 15:05:22 |
| Message-ID: | 20130304150522.GA9507@alvh.no-ip.org |
| Views: | Raw Message | Whole Thread | Download mbox | Resend email |
| Thread: | |
| Lists: | pgsql-www |
Magnus Hagander wrote:
> On Mon, Mar 4, 2013 at 1:50 PM, Andres Freund <andres(at)2ndquadrant(dot)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?
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
| From | Date | Subject | |
|---|---|---|---|
| Next Message | Tom Lane | 2013-03-04 15:09:10 | Re: gitweb is no longer a real-time view |
| Previous Message | Andres Freund | 2013-03-04 15:03:44 | Re: gitweb is no longer a real-time view |