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 0135A1F404 for ; Wed, 28 Mar 2018 05:57:49 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751973AbeC1F5r (ORCPT ); Wed, 28 Mar 2018 01:57:47 -0400 Received: from mail.javad.com ([54.86.164.124]:47282 "EHLO mail.javad.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751166AbeC1F5q (ORCPT ); Wed, 28 Mar 2018 01:57:46 -0400 Received: from osv (unknown [89.175.180.246]) by mail.javad.com (Postfix) with ESMTPSA id 8095C3E863; Wed, 28 Mar 2018 05:57:44 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=javad.com; s=default; t=1522216665; bh=/WMk3tDUHGNwowsPThcHhX5ZcUJBR7unwWtFqCxAbuE=; l=2092; h=Received:From:To:Subject; b=XhoM/txzr2Ey4qh6D7t6qQ4H0alAq+nYK8XOoO79nqEfhy0elJxO6X07UD/7ECYhZ VzzDe35M2vZbRDgzX/1nG8XooVv07LscJKqK3NszCv6laArueMQLeEdwxoO89E0fW8 B904IhnwzH5aETz4Wp5pjsfuC0Hrh1nzexp/StRw= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=javad.com; s=default; t=1522216665; bh=/WMk3tDUHGNwowsPThcHhX5ZcUJBR7unwWtFqCxAbuE=; l=2092; h=Received:From:To:Subject; b=XhoM/txzr2Ey4qh6D7t6qQ4H0alAq+nYK8XOoO79nqEfhy0elJxO6X07UD/7ECYhZ VzzDe35M2vZbRDgzX/1nG8XooVv07LscJKqK3NszCv6laArueMQLeEdwxoO89E0fW8 B904IhnwzH5aETz4Wp5pjsfuC0Hrh1nzexp/StRw= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=javad.com; s=default; t=1522216665; bh=/WMk3tDUHGNwowsPThcHhX5ZcUJBR7unwWtFqCxAbuE=; l=2092; h=Received:From:To:Subject; b=XhoM/txzr2Ey4qh6D7t6qQ4H0alAq+nYK8XOoO79nqEfhy0elJxO6X07UD/7ECYhZ VzzDe35M2vZbRDgzX/1nG8XooVv07LscJKqK3NszCv6laArueMQLeEdwxoO89E0fW8 B904IhnwzH5aETz4Wp5pjsfuC0Hrh1nzexp/StRw= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=javad.com; s=default; t=1522216665; bh=/WMk3tDUHGNwowsPThcHhX5ZcUJBR7unwWtFqCxAbuE=; l=2092; h=Received:From:To:Subject; b=XhoM/txzr2Ey4qh6D7t6qQ4H0alAq+nYK8XOoO79nqEfhy0elJxO6X07UD/7ECYhZ VzzDe35M2vZbRDgzX/1nG8XooVv07LscJKqK3NszCv6laArueMQLeEdwxoO89E0fW8 B904IhnwzH5aETz4Wp5pjsfuC0Hrh1nzexp/StRw= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=javad.com; s=default; t=1522216665; bh=/WMk3tDUHGNwowsPThcHhX5ZcUJBR7unwWtFqCxAbuE=; l=2092; h=Received:From:To:Subject; b=XhoM/txzr2Ey4qh6D7t6qQ4H0alAq+nYK8XOoO79nqEfhy0elJxO6X07UD/7ECYhZ VzzDe35M2vZbRDgzX/1nG8XooVv07LscJKqK3NszCv6laArueMQLeEdwxoO89E0fW8 B904IhnwzH5aETz4Wp5pjsfuC0Hrh1nzexp/StRw= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=javad.com; s=default; t=1522216665; bh=/WMk3tDUHGNwowsPThcHhX5ZcUJBR7unwWtFqCxAbuE=; l=2092; h=Received:From:To:Subject; b=XhoM/txzr2Ey4qh6D7t6qQ4H0alAq+nYK8XOoO79nqEfhy0elJxO6X07UD/7ECYhZ VzzDe35M2vZbRDgzX/1nG8XooVv07LscJKqK3NszCv6laArueMQLeEdwxoO89E0fW8 B904IhnwzH5aETz4Wp5pjsfuC0Hrh1nzexp/StRw= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=javad.com; s=default; t=1522216665; bh=/WMk3tDUHGNwowsPThcHhX5ZcUJBR7unwWtFqCxAbuE=; l=2092; h=Received:From:To:Subject; b=XhoM/txzr2Ey4qh6D7t6qQ4H0alAq+nYK8XOoO79nqEfhy0elJxO6X07UD/7ECYhZ VzzDe35M2vZbRDgzX/1nG8XooVv07LscJKqK3NszCv6laArueMQLeEdwxoO89E0fW8 B904IhnwzH5aETz4Wp5pjsfuC0Hrh1nzexp/StRw= 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 1f145e-0002bY-BV; Wed, 28 Mar 2018 08:57:42 +0300 From: Sergey Organov To: Johannes Schindelin Cc: Igor Djordjevic , phillip.wood@dunelm.org.uk, Jacob Keller , 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> Date: Wed, 28 Mar 2018 08:57:42 +0300 In-Reply-To: (Johannes Schindelin's message of "Tue, 27 Mar 2018 15:49:17 +0200 (DST)") Message-ID: <874ll0d9nt.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 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? [...] >> > The implementation detail is, of course, that I will introduce this with >> > the technically-simpler strategy: always recreating merge commits with the >> > recursive strategy. A follow-up patch series will add support for rebasing >> > merge commits, and then use it by default. >> >> Switching to use it by default would be backward incompatible again? Yet >> another option to obsolete? Sigh. > > Oh wow. > > Backwards compatibility of a feature that existed only as a topic branch > in `next` before being worked on more? Any other splendid ideas? Either you care about compatibility or not. You can't have it both ways, sorry. And "technically-simpler strategy: always recreating merge commits with the recursive strategy" vs. "rebasing merge commits" is not just a minor strategy change, it's entire paradigm shift in handling merge commits while rebasing. I'm afraid you will still come up with a wrong design unless you finally accept this fact. -- Sergey