From owner-freebsd-git@freebsd.org Mon Feb 22 20:35:01 2021 Return-Path: Delivered-To: freebsd-git@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 0802854DD3F for ; Mon, 22 Feb 2021 20:35:01 +0000 (UTC) (envelope-from rene@freebsd.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2610:1c1:1:6074::16:84]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "freefall.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Dkv7S6rzmz4khf; Mon, 22 Feb 2021 20:35:00 +0000 (UTC) (envelope-from rene@freebsd.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1614026101; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=obKRMkaBmwjphkM499DXzjqxeNZDLywBpnA+ikH+C6k=; b=s4NoXFZioYOF14I5NqzducU5MLX7rydXnryFi1yDkbmns/UYEnIZOErfwAGMSJSUTz7IzY bslKQmP+B1jBUK+w9LvEgNgoQqHdHR7qswuEsuEEI1e+sa8CUw+2xXK4TiBgCJF9R52DIr vMAWSzTYPenuJtsT87WwY23UwUaR4trG/KYcddpFn5fF9jIhsKhrSCKaPBYItEsU5h8TV8 Z48rROVF/MWCON0elfuRvgxSSJC555CZc17a8hEi6A/wJKxxLdR+c0+kPqtHrlb3bS2Ikt TRaPEvYUh6NlTKxB2/IIBubRueqq2cac8pjv+Ksu+AfC82Z8WHmXJee4aBjk9g== Received: by freefall.freebsd.org (Postfix, from userid 1185) id E446E1A734; Mon, 22 Feb 2021 20:35:00 +0000 (UTC) Date: Mon, 22 Feb 2021 20:35:00 +0000 From: Rene Ladan To: Cy Schubert Cc: freebsd-git@freebsd.org Subject: Re: Ports Repocopy Message-ID: <20210222203500.GA75838@freefall.freebsd.org> References: <202102221945.11MJjCiO063445@slippy.cwsent.com> MIME-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <202102221945.11MJjCiO063445@slippy.cwsent.com> ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1614026101; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=obKRMkaBmwjphkM499DXzjqxeNZDLywBpnA+ikH+C6k=; b=jZaX8Xr64jXQns3pRBNvv672W5wsuwNGTD1KLbLqlLcGJ5mJ2MiFgGmlO0dQRFG7TqOAn2 06PLZRbgYddNlVEl+0vV3AF7aULXv+pucFXCx4BP4K8CqR+P5i12BWqB970dL8zNUhHNvE NVaoDc55JxvfujxoWslomvRc24NUihzU87GscDnNmCDrtB+lDargXCnTBHv5uERtaPsETV RWrE1KEOz9GBc4LaZ8fY31Ch78Rn1iGzRUwx1IjFNP3miAH8aTlIB4NtDr44CtInK5hT2T fTofRBnST1u4RVDNkYSMJi+v9Xw95fuIYQX6BFW7hik3UHWwnFp19/avolciqA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1614026101; a=rsa-sha256; cv=none; b=o5NtWhS0rgaUz/Al4V3bqOBbp4Jg59GjhZ6s4wVUGb/n9riMoD/I/dOqRgLxqq0aZZLsZ2 Y3I7p5ltELBfu5idpcBgr6sGTGa5P9eux48ylAnLAoirWjEDBsH/LYCxpcHof22f+ALY2a 4jkBDbem3L4cZez3LgOyjbIr6CwF3ZNpduZmTSPPyUbl1doBcwT1DBVWkP1OG+w8Gpiknx cjth5fp+O+uPVXCPJbPfnARw4T5+W2ylr+QugA7wXIETtIH3Fw5N7m5WF5bRVuTkuFtcLg ScrC3im4h/DjWnfZKxlR/TXC/rXPTRP+UoCLiLc6n3PkQVaz5comhBTgwBjRKQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-BeenThere: freebsd-git@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Discussion of git use in the FreeBSD project List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 22 Feb 2021 20:35:01 -0000 On Mon, Feb 22, 2021 at 11:45:12AM -0800, Cy Schubert wrote: > When ports switches to GIT, given that there is no GIT equivalent to svn > copy will repocopy become a thing of the past? Will we live with this or > will there be some kind of procedure ports committers must follow to > approximate a repocopy? > There is indeed no "git cp", only "git mv", so unless I'm mistaken repocopies will be a past thing. It might be possible to (credits to portmgr): - create a branch, - copy/move the files and commit the copy/moves without any changes, - change the stuff, - commit, - merge into the main branch. Similar for resurrecting a port: - create a branch from before the port was removed, - change stuff, - commit, - merge into the main branch (using something like "git merge -s their" so that the resurrection branch overwrites the removal) But this would warrant a new script if it turns out to be feasible. I have not tried this yet. René