Received: from malur.postgresql.org ([217.196.149.56]) by arkaria.postgresql.org with esmtp (Exim 4.72) (envelope-from ) id 1UCWxH-0005bp-Cg for pgsql-www@arkaria.postgresql.org; Mon, 04 Mar 2013 15:05:31 +0000 Received: from localhost ([127.0.0.1] helo=postgresql.org) by malur.postgresql.org with smtp (Exim 4.72) (envelope-from ) id 1UCWxG-0002AF-Op for pgsql-www@arkaria.postgresql.org; Mon, 04 Mar 2013 15:05:30 +0000 Received: from magus.postgresql.org ([2a02:c0:301:0:ffff::29]) by malur.postgresql.org with esmtp (Exim 4.72) (envelope-from ) id 1UCWxG-0002AA-3O for pgsql-www@postgresql.org; Mon, 04 Mar 2013 15:05:30 +0000 Received: from smtprelay0044.b.hostedemail.com ([64.98.42.44] helo=smtprelay.b.hostedemail.com) by magus.postgresql.org with esmtp (Exim 4.72) (envelope-from ) id 1UCWxD-0002Cs-1V for pgsql-www@postgresql.org; Mon, 04 Mar 2013 15:05:29 +0000 Received: from filter.hostedemail.com (b-bigip1 [10.5.19.254]) by smtprelay05.b.hostedemail.com (Postfix) with SMTP id CCF6C2A44F08; Mon, 4 Mar 2013 15:05:25 +0000 (UTC) X-Panda: scanned! X-Spam-Summary: 40, 2.5, 0, , d41d8cd98f00b204, alvherre@alvh.no-ip.org, :::::::::::::, RULES_HIT:355:379:599:601:800:960:967:973:988:989:1260:1277:1311:1312:1313:1314:1345:1358:1359:1431:1437:1515:1516:1518:1519:1534:1541:1593:1594:1595:1596:1711:1730:1747:1777:1792:2393:2525:2553:2560:2563:2682:2685:2736:2828:2859:2933:2937:2939:2942:2945:2947:2951:2954:3022:3027:3138:3139:3140:3141:3142:3352:3865:3866:3867:3868:3871:3872:3873:3874:3934:3936:3938:3941:3944:3947:3950:3953:3956:3959:4250:4321:4605:4659:5007:6261:7679:7974:9025:9121:10004:10400:10848:11232:11256:11257:11658:11914:12043:12109:12438:12517:12519:12555, 0, RBL:none, CacheIP:none, Bayesian:0.5, 0.5, 0.5, Netcheck:none, DomainCache:0, MSF:not bulk, SPF:fn, MSBL:0, DNSBL:none, Custom_rules:0:0:0 X-Session-Marker: 616C76686572726540616C76682E6E6F2D69702E6F7267 X-Filterd-Recvd-Size: 2518 Received: from perhan.alvh.no-ip.org (unknown [190.95.28.201]) (Authenticated sender: alvherre@alvh.no-ip.org) by omf08.b.hostedemail.com (Postfix) with ESMTPA; Mon, 4 Mar 2013 15:05:24 +0000 (UTC) Received: by perhan.alvh.no-ip.org (Postfix, from userid 1000) id A6BF36E02C; Mon, 4 Mar 2013 12:05:22 -0300 (CLST) Date: Mon, 4 Mar 2013 12:05:22 -0300 From: Alvaro Herrera To: Magnus Hagander Cc: Andres Freund , Tom Lane , Kevin Grittner , Peter Eisentraut , PostgreSQL WWW , Stephen Frost Subject: Re: gitweb is no longer a real-time view Message-ID: <20130304150522.GA9507@alvh.no-ip.org> References: <19759.1362357835@sss.pgh.pa.us> <20130304020324.GE16142@tamriel.snowman.net> <2480.1362363162@sss.pgh.pa.us> <20130304023335.GH16142@tamriel.snowman.net> <20130304125013.GB3943@awork2.anarazel.de> MIME-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Disposition: inline In-Reply-To: User-Agent: Mutt/1.5.21 (2010-09-15) Content-Transfer-Encoding: quoted-printable X-Pg-Spam-Score: -1.9 (-) List-Archive: List-Help: List-ID: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: X-Mailing-List: pgsql-www Precedence: bulk Sender: pgsql-www-owner@postgresql.org Magnus Hagander wrote: > On Mon, Mar 4, 2013 at 1:50 PM, Andres Freund wr= ote: >=20 > > 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. >=20 > I satarted looking at doing this, but this is backwards, right? >=20 > Commit bc61878682051678ade5f59da7bfd90ab72ce13b exists on anongit, and > only there. >=20 > 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. --=20 =C1lvaro Herrera http://www.2ndQuadrant.com/ PostgreSQL Development, 24x7 Support, Training & Services --=20 Sent via pgsql-www mailing list (pgsql-www@postgresql.org) To make changes to your subscription: http://www.postgresql.org/mailpref/pgsql-www