Date: Mon, 4 Mar 2013 16:17:09 +0100
From: Andres Freund <andres@2ndquadrant.com>
To: Alvaro Herrera <alvherre@2ndquadrant.com>
Cc: Tom Lane <tgl@sss.pgh.pa.us>, 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: <20130304151709.GM3943@awork2.anarazel.de>
References: <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>
	<20130304144609.GI3943@awork2.anarazel.de>
	<5346.1362409750@sss.pgh.pa.us>
	<20130304151526.GC9507@alvh.no-ip.org>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <20130304151526.GC9507@alvh.no-ip.org>
Precedence: bulk
Sender: pgsql-www-owner@postgresql.org

On 2013-03-04 12:15:26 -0300, Alvaro Herrera wrote:
> Tom Lane wrote:
> > Andres Freund <andres@2ndquadrant.com> writes:
> > > On 2013-03-04 09:40:38 -0500, Tom Lane wrote:
> > >> 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
> > 
> > Ah, right, so it is still there but it's not in the chain leading to
> > HEAD.  So "forced update" really means "I moved HEAD in a non fast
> > forward way"?
> 
> Well, to git, "non fast forward" can also mean create a merge commit of
> two heads, which isn't very problematic.  A forced update might mean
> (such as in this case) that one or more commits are left completely
> disconnected from history -- that's much worse.

Well, but thats during pulling/merging and not during pushing. The
latter doesn't do any merges.

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