public inbox for [email protected]  

help / color / mirror / Atom feed

From: Andres Freund <[email protected]>
To: Alvaro Herrera <[email protected]>
Cc: Tom Lane <[email protected]>
Cc: Magnus Hagander <[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 16:17:09 +0100
Message-ID: <[email protected]> (raw)
In-Reply-To: <[email protected]>
References: <[email protected]>
	<[email protected]>
	<CABUevEwfw24iF9-czueLSmdFQwck012qfVmLXcoKbG37xG56jQ@mail.gmail.com>
	<CABUevEzM2F8qAxVds9Me-41L5BqeEGO4DuosCQhC0C6v05HPUw@mail.gmail.com>
	<[email protected]>
	<[email protected]>
	<[email protected]>
	<[email protected]>
	<[email protected]>
	<[email protected]>
List-Unsubscribe: <mailto:[email protected]?body=unsub%20pgsql-www>

On 2013-03-04 12:15:26 -0300, Alvaro Herrera wrote:
> Tom Lane wrote:
> > Andres Freund <[email protected]> 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 ([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