Date: Mon, 4 Mar 2013 15:46:09 +0100
From: Andres Freund <andres@2ndquadrant.com>
To: Tom Lane <tgl@sss.pgh.pa.us>
Cc: Alvaro Herrera <alvherre@2ndquadrant.com>,
	Magnus Hagander <magnus@hagander.net>, Kevin Grittner <kgrittn@mail.com>,
	Peter Eisentraut <peter_e@gmx.net>,
	PostgreSQL WWW <pgsql-www@postgresql.org>,
	Stephen Frost <sfrost@snowman.net>
Subject: Re: gitweb is no longer a real-time view
Message-ID: <20130304144609.GI3943@awork2.anarazel.de>
References: <19759.1362357835@sss.pgh.pa.us>
	<20130304020324.GE16142@tamriel.snowman.net>
	<2480.1362363162@sss.pgh.pa.us>
	<20130304023335.GH16142@tamriel.snowman.net>
	<CABUevEwfw24iF9-czueLSmdFQwck012qfVmLXcoKbG37xG56jQ@mail.gmail.com>
	<CABUevEzM2F8qAxVds9Me-41L5BqeEGO4DuosCQhC0C6v05HPUw@mail.gmail.com>
	<20130304125013.GB3943@awork2.anarazel.de>
	<20130304143349.GX9507@alvh.no-ip.org>
	<4725.1362408038@sss.pgh.pa.us>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <4725.1362408038@sss.pgh.pa.us>
Precedence: bulk
Sender: pgsql-www-owner@postgresql.org

On 2013-03-04 09:40:38 -0500, Tom Lane wrote:
> Alvaro Herrera <alvherre@2ndquadrant.com> writes:
> > Andres Freund 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 agree this seems the sanest course of action, but I think it would be
> > better to install defenses in the master repo so that forced pushes are
> > no longer allowed *before* rebasing gitmaster; otherwise some other
> > committer could clobber things again if they don't force-pull their
> > trees.
> 
> Agreed.  I'm astonished that we had this configured this way in the
> first place.
> 
> FWIW, I noticed something about a "forced update" when I did a git pull
> after Kevin's commits.  I failed to pay enough attention though.  Now
> that I look, the xml fix is not in my local history either, and I don't
> know what bc61878682051678ade5f59da7bfd90ab72ce13b is because none of
> the recent commits have that hash according to my repo:

That is/was your map_sql_value_to_xml_value() commit which is now not in
the normal history anymore because kevin pushed a HEAD that didn't
include it.  You should be able to see it with git show
bc61878682051678ade5f59da7bfd90ab72ce13b

Greetings,

Andres Freund

-- 
 Andres Freund	                   http://www.2ndQuadrant.com/
 PostgreSQL Development, 24x7 Support, Training & Services


-- 
Sent via pgsql-www mailing list (pgsql-www@postgresql.org)
To make changes to your subscription:
http://www.postgresql.org/mailpref/pgsql-www