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: AS53758 23.128.96.0/24 X-Spam-Status: No, score=-3.9 required=3.0 tests=AWL,BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE,SPF_HELO_PASS,SPF_PASS shortcircuit=no autolearn=ham autolearn_force=no version=3.4.2 Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by dcvr.yhbt.net (Postfix) with ESMTP id 8618B1F8C6 for ; Thu, 29 Jul 2021 23:00:48 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234000AbhG2XAp (ORCPT ); Thu, 29 Jul 2021 19:00:45 -0400 Received: from pb-smtp1.pobox.com ([64.147.108.70]:56665 "EHLO pb-smtp1.pobox.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229991AbhG2XAp (ORCPT ); Thu, 29 Jul 2021 19:00:45 -0400 Received: from pb-smtp1.pobox.com (unknown [127.0.0.1]) by pb-smtp1.pobox.com (Postfix) with ESMTP id BBB46ECF07; Thu, 29 Jul 2021 19:00:40 -0400 (EDT) (envelope-from junio@pobox.com) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed; d=pobox.com; h=from:to:cc :subject:references:date:in-reply-to:message-id:mime-version :content-type; s=sasl; bh=v9rzzcNIjBhmhsSNhr5jQY5iJkBPOGF/BrcFSR k9dXQ=; b=sjoiXZxhlFIhQoTeW7yrmvehd6OvSg4c7KNkkrEvQzDbSULI9Gek/u 6C6c1zFTVXmaQgPTqvluJhtTMH9sLnd224O6lsfO3RwVbnDvzN6+6LnbKRaNjvsI WPTgkvJGxQiJVIGTeKMup2sPr2y25gNhfULl09IfqdK46vg7tPyp0= Received: from pb-smtp1.nyi.icgroup.com (unknown [127.0.0.1]) by pb-smtp1.pobox.com (Postfix) with ESMTP id AFC4DECF06; Thu, 29 Jul 2021 19:00:40 -0400 (EDT) (envelope-from junio@pobox.com) Received: from pobox.com (unknown [35.196.71.182]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pb-smtp1.pobox.com (Postfix) with ESMTPSA id 27656ECF04; Thu, 29 Jul 2021 19:00:40 -0400 (EDT) (envelope-from junio@pobox.com) From: Junio C Hamano To: "Derrick Stolee via GitGitGadget" Cc: git@vger.kernel.org, newren@gmail.com, matheus.bernardino@usp.br, stolee@gmail.com, Eric Sunshine , Derrick Stolee Subject: Re: [PATCH v3 0/5] Sparse Index: Integrate with 'git add' References: Date: Thu, 29 Jul 2021 16:00:39 -0700 In-Reply-To: (Derrick Stolee via GitGitGadget's message of "Thu, 29 Jul 2021 14:52:02 +0000") Message-ID: User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.2 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain X-Pobox-Relay-ID: CB6674BA-F0C0-11EB-B15D-8B3BC6D8090B-77302942!pb-smtp1.pobox.com Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org "Derrick Stolee via GitGitGadget" writes: > Update: Elijah points out that the SKIP_WORKTREE bit is removed from > conflict files, which allows adding the conflicted files without warning. > (However, we also need to be careful about untracked files, as documented in > the test added here.) > > The first patch of this series adds tests that create merge conflicts > outside of the sparse cone and then presents different ways a user could > resolve the situation. We want all of them to be feasible, and this > includes: > > 1. Reverting the file to a known version in history. > 2. Adding the file with its contents on disk. > 3. Moving the file to a new location in the sparse directory. > > The one place I did continue to update is 'git add --refresh ' to match the > behavior added by mt/add-rm-in-sparse-checkout which outputs an error > message. This happens even when the file exists in the working directory, > but that seems appropriate enough. > > > Updates in V3 > ============= > > * Added disclaimer to the merge-conflict test that this is documenting > current behavior, not endorsing it. > > * Added Elijah's reviewed-by. Thanks for the review! > > Thanks, -Stolee Thanks, both. Let's queue this and start merging it down.