From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on dcvr.yhbt.net X-Spam-Level: X-Spam-ASN: AS31976 209.132.180.0/23 X-Spam-Status: No, score=-4.1 required=3.0 tests=AWL,BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI,RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL,SPF_HELO_NONE,SPF_NONE shortcircuit=no autolearn=ham autolearn_force=no version=3.4.2 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by dcvr.yhbt.net (Postfix) with ESMTP id 2657A1F46C for ; Mon, 13 Jan 2020 00:43:47 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2387543AbgAMAnp (ORCPT ); Sun, 12 Jan 2020 19:43:45 -0500 Received: from pb-smtp21.pobox.com ([173.228.157.53]:61091 "EHLO pb-smtp21.pobox.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2387539AbgAMAnp (ORCPT ); Sun, 12 Jan 2020 19:43:45 -0500 Received: from pb-smtp21.pobox.com (unknown [127.0.0.1]) by pb-smtp21.pobox.com (Postfix) with ESMTP id 7CBB7A3387; Sun, 12 Jan 2020 19:43:43 -0500 (EST) (envelope-from junio@pobox.com) DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=pobox.com; h=from:to:cc :subject:references:date:in-reply-to:message-id:mime-version :content-type; s=sasl; bh=r/ppObTaIfek36D4lLc8IdOg608=; b=VY64za XGP0Em9c2JYVIUO4avGlR5QcXMv77XwOISfRGH2XEnpoQL4O4wn5ZUUvE8CGV2UA jIMPU3A/yoFzWX9+Biw7830aiTI7PrkyDhBsB/5/6ExHCOZf3OVun7PpVFdOGIeT 1AIJIo2b9Nxgjj1ReEeBn71HrQTgxxve7W+R8= DomainKey-Signature: a=rsa-sha1; c=nofws; d=pobox.com; h=from:to:cc :subject:references:date:in-reply-to:message-id:mime-version :content-type; q=dns; s=sasl; b=ZxEsInvDYI0jsz2zdlP5aAUtlAJZpR1A dZYv5HlohZBwr7JXnRATSkaSiRDnXp66VyX3FQ2y0r0tLXwCb8nIIvCcfu1v/exM 1EhVouwG0C4MzA/Xwmhjxh4hq+PIadqIKOkNq4lfagb6vdgif2a+JtMwvjKrakCu s3V+SjnSqkc= Received: from pb-smtp21.sea.icgroup.com (unknown [127.0.0.1]) by pb-smtp21.pobox.com (Postfix) with ESMTP id 7577AA3385; Sun, 12 Jan 2020 19:43:43 -0500 (EST) (envelope-from junio@pobox.com) Received: from pobox.com (unknown [34.76.80.147]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pb-smtp21.pobox.com (Postfix) with ESMTPSA id 9A58DA3384; Sun, 12 Jan 2020 19:43:40 -0500 (EST) (envelope-from junio@pobox.com) From: Junio C Hamano To: Phillip Wood Cc: Git Mailing List , Johannes Schindelin , Rohit Ashiwal , Jonathan Nieder Subject: Re: Problems with ra/rebase-i-more-options - should we revert it? References: <089637d7-b4b6-f6ba-cce1-29e22ce47521@gmail.com> Date: Sun, 12 Jan 2020 16:43:38 -0800 In-Reply-To: (Junio C. Hamano's message of "Sun, 12 Jan 2020 13:12:08 -0800") Message-ID: User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/26.3 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain X-Pobox-Relay-ID: BE43F242-359D-11EA-A87B-8D86F504CC47-77302942!pb-smtp21.pobox.com Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Junio C Hamano writes: > Phillip Wood writes: > >> On 12/01/2020 16:12, Phillip Wood wrote: >>> I'm concerned that there are some bugs in this series and think >>> it may be best to revert it before releasing 2.25.0. > > Let's do that. > ... >>> J > > In any case, the tip of 'master' (hence the one that would become > the final) is simpler to remedy by just reverting the merge, but > there are a handful of in-flight topics that may have been queued by > forking 'master' after the problematic merge was made (iow, anything > after the fifth batch for this cycle), which I'd have to be a bit > careful when I merge them down, lest they attempt to pull in the bad > topic again. But that will be something we need to worry about > after the release, not before the final. I will push out what I wish to be able to tag as the final [*1*] shortly but without actually tagging, so that it can get a bit wider exposure than just the usual "Gitster tested locally and then did let Travis try them" testing. Thanks. [Reference] *1* The tip of 'master' as of this writing is v2.25.0-rc2-24-gb4615e40a8