Re: gitweb is no longer a real-time view
От | Andres Freund |
---|---|
Тема | Re: gitweb is no longer a real-time view |
Дата | |
Msg-id | 20130304144609.GI3943@awork2.anarazel.de обсуждение исходный текст |
Ответ на | Re: gitweb is no longer a real-time view (Tom Lane <tgl@sss.pgh.pa.us>) |
Ответы |
Re: gitweb is no longer a real-time view
|
Список | pgsql-www |
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
В списке pgsql-www по дате отправления: