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: AS3215 2.6.0.0/16 X-Spam-Status: No, score=2.6 required=3.0 tests=AWL,BAYES_00,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,LIST_MIRROR_RECEIVED, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE shortcircuit=no autolearn=no autolearn_force=no version=3.4.2 Received: from out1.vger.email (out1.vger.email [IPv6:2620:137:e000::1:20]) by dcvr.yhbt.net (Postfix) with ESMTP id 52A6F1F852 for ; Wed, 2 Feb 2022 22:01:26 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1347738AbiBBWBW (ORCPT ); Wed, 2 Feb 2022 17:01:22 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33532 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230365AbiBBWBO (ORCPT ); Wed, 2 Feb 2022 17:01:14 -0500 Received: from mail-pj1-x102f.google.com (mail-pj1-x102f.google.com [IPv6:2607:f8b0:4864:20::102f]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 5738FC061714 for ; Wed, 2 Feb 2022 14:01:14 -0800 (PST) Received: by mail-pj1-x102f.google.com with SMTP id s61-20020a17090a69c300b001b4d0427ea2so8114901pjj.4 for ; Wed, 02 Feb 2022 14:01:14 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=sender:from:to:cc:subject:references:date:in-reply-to:message-id :user-agent:mime-version; bh=oCpGIJORd+Gdl6mJ5YldYXd+dJY3jWX1+1gQSlqei4U=; b=KUuNUh6ods341bxUkLD24rQcnyYWxkTzV4jlX1YSjSMBjHUrbGkzT3ClZu911ZAaka dmUdOBCPHK/N0oIaDDddDPgU8i1SjxZNNm+VAxSAskaXc/6swUpez+IYGApX5ShZixl3 8EADUjFIW3kimC7y591eqt3xr9hbPiBSH+mBrxFOYKAmWJu6IN8dlmNp7PwzasqwaK76 Xg7SKsEmWqAvL3DVUq86RZVhDzJ6/MI2ds0lCONnvccw/CXuC7/a656wG2zHBPFHSOmf j8FiR4GD2d2sQJmEkB2GWS6mJOTgYNyUcjMdB/Y63fnxXSt0jNSk+W2qMwDw08uoVq+1 NduQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:sender:from:to:cc:subject:references:date :in-reply-to:message-id:user-agent:mime-version; bh=oCpGIJORd+Gdl6mJ5YldYXd+dJY3jWX1+1gQSlqei4U=; b=mVVP/0aRTkYKE+HJm4yHrRypVE16elIx62oB4uhwTKjrTa7jyrMJzPqKY+CledprrN GnrVPsuJLFTkbIc/ZQ+10zuqisHz67FaQPB0JiPh/XEmuX6V3oGv++1s269n2jp1pyi2 DWDIilqypal3cOOCIvvG5bhBWG2UyDVBtSVsDnq+/hNMMh2SM8LrAV85gQnF7/TqZ6ey Im/4vgASQwrmJqbF/0s3OcynzInwIAyjFbDW9OiJ+kV5Bu9dCVe1dSfkiBwBKGaIlHJ/ Wg/IK2n/lwgxeP/PbPtfIcLlEQv+boM+vXyZcO6LwW8V88TuDZFLRMIi+DgcAGhLakPA KSqg== X-Gm-Message-State: AOAM532nC6GxWHvDzNHYy6wCfhMKnpIG7AVXpe48F9hKzDYzicTQfGiD 3AqC03CJ3P6LcNFyiGNnfW4= X-Google-Smtp-Source: ABdhPJwFy2vi07qsHrPVPDoZL7cczdfFBeg0SIrZICDMjFcuKIH0tzfHLdXjueh8yoNmRL8On//GoA== X-Received: by 2002:a17:902:8d81:: with SMTP id v1mr32723436plo.20.1643839273682; Wed, 02 Feb 2022 14:01:13 -0800 (PST) Received: from localhost ([2620:15c:289:200:da7f:76ba:d0d5:da44]) by smtp.gmail.com with ESMTPSA id d8sm7219844pjz.32.2022.02.02.14.01.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 02 Feb 2022 14:01:13 -0800 (PST) Sender: Junio C Hamano From: Junio C Hamano To: Elijah Newren Cc: Elijah Newren via GitGitGadget , Git Mailing List , Christian Couder , Taylor Blau , Johannes Altmanninger , Ramsay Jones , Johannes Schindelin , Christian Couder , =?utf-8?Q?Ren=C3=A9?= Scharfe , =?utf-8?B?w4Z2YXIgQXJuZmrDtnLDsA==?= Bjarmason , Johannes Sixt Subject: Re: [PATCH v3 04/15] merge-tree: implement real merges References: <02c29f920d0d5fde6d85f7b86a69be92e3f0f34d.1643787281.git.gitgitgadget@gmail.com> Date: Wed, 02 Feb 2022 14:01:12 -0800 In-Reply-To: (Elijah Newren's message of "Wed, 2 Feb 2022 13:56:56 -0800") Message-ID: User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.2 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Elijah Newren writes: > Yes, you are reading right. I think the cherry-pick/rebase > replacement actually deserves a separate command from what merges > should use; replaying a sequence of commits just has a number of UI > differences and abilities that I think pull it in a different > direction. I completely disagree. Each individual step in a sequence of replaying commits in order (or in reverse order) should be scriptable as a single merge-tree that takes "apply the change to go from A^ to A on X". Sequencing and placing UI around it is a job for the script that drives merge-tree.