From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on dcvr.yhbt.net X-Spam-Level: X-Spam-ASN: AS31976 209.132.180.0/23 X-Spam-Status: No, score=-2.9 required=3.0 tests=AWL,BAYES_00, DKIM_ADSP_CUSTOM_MED,DKIM_SIGNED,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,RCVD_IN_DNSWL_HI,T_DKIM_INVALID, T_RP_MATCHES_RCVD shortcircuit=no autolearn=no autolearn_force=no version=3.4.0 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by dcvr.yhbt.net (Postfix) with ESMTP id 4E1571F424 for ; Wed, 28 Mar 2018 11:29:17 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752338AbeC1L3P (ORCPT ); Wed, 28 Mar 2018 07:29:15 -0400 Received: from mail.javad.com ([54.86.164.124]:42058 "EHLO mail.javad.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752161AbeC1L3N (ORCPT ); Wed, 28 Mar 2018 07:29:13 -0400 Received: from osv (unknown [89.175.180.246]) by mail.javad.com (Postfix) with ESMTPSA id 12D193E899; Wed, 28 Mar 2018 11:29:12 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=javad.com; s=default; t=1522236552; bh=k01evPYiY9EaxxUBq8u/84vK8WJXSgTTGSYQIn1q7DM=; l=2176; h=Received:From:To:Subject; b=IaNPHx7NRYII+hYgGl9cyz/FLTXiDT4gIfENnQZ8WU7oMrLeRrPa8lkFmllSO6FMi l6N0jRh0gsU0LcWk8xxos8MGCL7CzxUEw6tNfNkUAIPBx7OpyghVxEd3vh4wlZPqPL GT1gYWG1dH4EH6d56369Mgcviw5s8E6NQau8Sjic= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=javad.com; s=default; t=1522236552; bh=k01evPYiY9EaxxUBq8u/84vK8WJXSgTTGSYQIn1q7DM=; l=2176; h=Received:From:To:Subject; b=IaNPHx7NRYII+hYgGl9cyz/FLTXiDT4gIfENnQZ8WU7oMrLeRrPa8lkFmllSO6FMi l6N0jRh0gsU0LcWk8xxos8MGCL7CzxUEw6tNfNkUAIPBx7OpyghVxEd3vh4wlZPqPL GT1gYWG1dH4EH6d56369Mgcviw5s8E6NQau8Sjic= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=javad.com; s=default; t=1522236552; bh=k01evPYiY9EaxxUBq8u/84vK8WJXSgTTGSYQIn1q7DM=; l=2176; h=Received:From:To:Subject; b=IaNPHx7NRYII+hYgGl9cyz/FLTXiDT4gIfENnQZ8WU7oMrLeRrPa8lkFmllSO6FMi l6N0jRh0gsU0LcWk8xxos8MGCL7CzxUEw6tNfNkUAIPBx7OpyghVxEd3vh4wlZPqPL GT1gYWG1dH4EH6d56369Mgcviw5s8E6NQau8Sjic= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=javad.com; s=default; t=1522236552; bh=k01evPYiY9EaxxUBq8u/84vK8WJXSgTTGSYQIn1q7DM=; l=2176; h=Received:From:To:Subject; b=IaNPHx7NRYII+hYgGl9cyz/FLTXiDT4gIfENnQZ8WU7oMrLeRrPa8lkFmllSO6FMi l6N0jRh0gsU0LcWk8xxos8MGCL7CzxUEw6tNfNkUAIPBx7OpyghVxEd3vh4wlZPqPL GT1gYWG1dH4EH6d56369Mgcviw5s8E6NQau8Sjic= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=javad.com; s=default; t=1522236552; bh=k01evPYiY9EaxxUBq8u/84vK8WJXSgTTGSYQIn1q7DM=; l=2176; h=Received:From:To:Subject; b=IaNPHx7NRYII+hYgGl9cyz/FLTXiDT4gIfENnQZ8WU7oMrLeRrPa8lkFmllSO6FMi l6N0jRh0gsU0LcWk8xxos8MGCL7CzxUEw6tNfNkUAIPBx7OpyghVxEd3vh4wlZPqPL GT1gYWG1dH4EH6d56369Mgcviw5s8E6NQau8Sjic= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=javad.com; s=default; t=1522236552; bh=k01evPYiY9EaxxUBq8u/84vK8WJXSgTTGSYQIn1q7DM=; l=2176; h=Received:From:To:Subject; b=IaNPHx7NRYII+hYgGl9cyz/FLTXiDT4gIfENnQZ8WU7oMrLeRrPa8lkFmllSO6FMi l6N0jRh0gsU0LcWk8xxos8MGCL7CzxUEw6tNfNkUAIPBx7OpyghVxEd3vh4wlZPqPL GT1gYWG1dH4EH6d56369Mgcviw5s8E6NQau8Sjic= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=javad.com; s=default; t=1522236552; bh=k01evPYiY9EaxxUBq8u/84vK8WJXSgTTGSYQIn1q7DM=; l=2176; h=Received:From:To:Subject; b=IaNPHx7NRYII+hYgGl9cyz/FLTXiDT4gIfENnQZ8WU7oMrLeRrPa8lkFmllSO6FMi l6N0jRh0gsU0LcWk8xxos8MGCL7CzxUEw6tNfNkUAIPBx7OpyghVxEd3vh4wlZPqPL GT1gYWG1dH4EH6d56369Mgcviw5s8E6NQau8Sjic= Authentication-Results: mail.javad.com; spf=pass (sender IP is 89.175.180.246) smtp.mailfrom=osv@javad.com smtp.helo=osv Received-SPF: pass (mail.javad.com: connection is authenticated) Received: from osv by osv with local (Exim 4.84_2) (envelope-from ) id 1f19GP-0003Ij-Lu; Wed, 28 Mar 2018 14:29:09 +0300 From: Sergey Organov To: Jacob Keller Cc: Johannes Schindelin , Igor Djordjevic , Phillip Wood , Git Mailing List , Johannes Sixt , Junio C Hamano Subject: Re: [RFC] Rebasing merges: a jorney to the ultimate solution(RoadClear) References: <87y3jtqdyg.fsf@javad.com> <1298a701-a860-a675-83d7-72f29e14cd2b@talktalk.net> <1580e48a-be44-38dd-79af-8a2a31c5712e@talktalk.net> <754e2735-1288-9a8d-c8bd-ab39cf733812@gmail.com> <243ca23d-77a9-4ae1-a120-de6c6b195cdc@gmail.com> <87woxyf4lk.fsf@javad.com> <874ll0d9nt.fsf@javad.com> Date: Wed, 28 Mar 2018 14:29:09 +0300 In-Reply-To: (Jacob Keller's message of "Wed, 28 Mar 2018 00:20:31 -0700") Message-ID: <87r2o48mm2.fsf@javad.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.4 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Jacob Keller writes: > On Tue, Mar 27, 2018 at 10:57 PM, Sergey Organov wrote: >> >> Hi Johannes, >> >> Johannes Schindelin writes: >> > Hi Sergey, >> > >> >> [...] >> >> >> >> Reusing existing concepts where possible doesn`t have this problem. >> >> > >> >> > Existing concepts are great. As long as they fit the requirements of >> >> > the new scenarios. In this case, `pick` does *not* fit the > requirement >> >> > of "rebase a merge commit". >> >> >> >> It does, provided you use suitable syntax. >> > >> > You know what `pick` would also do, provided you use suitable syntax? > Pick >> > your nose. >> > >> > Don't blame me for this ridiculous turn the discussion took. >> > >> > Of course, using the suitable syntax you can do anything. Unless there > is >> > *already* a syntax and you cannot break it for backwards-compatibility >> > reasons, as is the case here. >> >> Backward compatibility to what? To a broken '--preserve-merges'? I had a >> feel you've invented '--recreate-merges' exactly to break that >> compatibility. No? >> >> Or is it "Backwards compatibility of a feature that existed only as a >> topic branch in `next` before being worked on more?", as you say >> yourself below? >> > > I'm pretty sure he meant that changing the meaning and behavior of "pick" > is incompatible, as people use scripts which check the edit lists, and > these scripts would expect pick to behave in a certain way. Are we still speaking about that new --recreate-merges feature? You already care for compatibility for it? You expect there are already scripts that use it? Once again, it seems like you care and don't care about backward compatibility at the same time, here is your phrase below: "He absolutely cares about compatibility, but in this case, the feature has not yet been merged into an official release." Are we still speaking about that new --recreate-merges feature? Do you guys care for compatibility for this particular --recreate-merges feature or not? I'm lost. "Yes" or "No" answer, if you please! -- Sergey