From owner-freebsd-git@freebsd.org Thu Apr 1 08:38:07 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 E6AD95C4518 for ; Thu, 1 Apr 2021 08:38:07 +0000 (UTC) (envelope-from marklmi@yahoo.com) Received: from sonic305-19.consmr.mail.gq1.yahoo.com (sonic305-19.consmr.mail.gq1.yahoo.com [98.137.64.82]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4F9xQl4HV3z3Byn for ; Thu, 1 Apr 2021 08:38:07 +0000 (UTC) (envelope-from marklmi@yahoo.com) X-SONIC-DKIM-SIGN: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yahoo.com; s=s2048; t=1617266285; bh=2zNk+7NnDHYtoaq7jcMKNt+zQXpW3GbHVUKUfdY/c8+=; h=X-Sonic-MF:Subject:From:Date:To:From:Subject; b=M9d0Ok7kP26BreB1DQunxNT66fBXzpssP1W3IgoJtG9XX5g4FBiMyHmW2xPmOTC7CK7RwLJn3sWsF/gWn80qC6zWKMZcle3lF0jnzMbHgJtmr40i/IW1XaEfqaDEShRT3zxGlbHAuNiJHLgdHbPTVR0ZrTxcSdZrl2Ji0Dp2Q5lZcGKm92GhyN+oLrP6B660fO6TJAiAt+SRglW7aunI720G09VhvdOcOakzdpQPQZDNRpkbsf+xoDvLFg8Z7LjNE6QSnrqMJFaZv+RfV7pMyQE8aAyl/kjsaQOMQccoQ571ESVgH9cDUGY4+F8KdC7EdJ7Jvyq/dwJlYYpJbSs9cw== X-YMail-OSG: kojFVboVM1nWVXoWMAfRmbYYFem9AJ6dPHC52j.Neuc0pcna5xqv0UQ3C3IV.VC 3JsNHzq_Y8JfQItIBZ0k5f1pe2rlgEDGYhiX_XzoW5.8OjUKMXn.JPGBP1mX68.Hvz_57NVx1k3e 50cZQte2ge24GdfZjVt6JY3HcAGq3CRoZWJyeZDDHx9TAhechuN_iRc5rmcPiXF3D8tsCRqGK_jl awAfWnjbLP0KWWEOr_Vh8r7UeVujhAjlgd2uXyvVmk3U6TB4tS5Rk9wb3vbw77TsdMCyeOzRai4o 8ZOvMRkpxIahbf4d8H0kT3C4GVNB1b4T5j5mzg7WT.lmmXa2hEYedwn3QRAs4XA1yHnrLfD2KjSP eTMqKulkGPbB6joGEqfcCNo5JXk8PzlKx85IIRO7niAMwfjmVC9olvTD6rVprxkGn7EC4PDO1Rje 74rb1HvI1MXXDtOXVxfyvvMve0IKYLan58FeT_02qCUkWca0MKoZG1RMAskDKhOw7TmmwsEiaL6v V.WwoKss0.83h_TrTwNTRyHmw0oarTW7RaYbf3H1XSKxXxmVJr0olcEbDpnP2dwf45Gz4hXSPGFq g9FmzMHWNv.KButAeP.cZ6TqRZQKvZfnrPvhv5K1g_s9ebS5Jn7p4Fdd3gJ.tsDAjFyDLEZcePk9 mzgvN7sDBcJiy3_m_0IhBqTrWidG08TzjG2llOqKelVjCky2IlWK6swgUnqQOVuYFed7JhulAhAp aBl0SAEs78xx3LUjZX3GuqUab86XuJwrAX3Ozip7ettUxN3DJQ2aRpl8oMzgonjDWhadtOxxXBQP iCVVXaSVw8V7iUUSFXCNA6jcm3gpRRIhv3.sRTKxKziD33PcMt1kEIYjvGCQNXp6U6myBtdKVQVw giZnOEHeB6HXaxojLHm_.yWjvlZFsPyz8dj6QAF_707Ybjypct4EHAjbR.nnNqUquGD4P4lF8LYN apIn9TYSFJzrLiC3Ih8FWHKxuzomM4hK.6CyP94mUEUtIb2Y2W4EmHIhl2d0CWeK_2Ecad4t9ewX MG7Cfda0mQzbUBHj2GJC_zioydRTR7ciTxWKULTd_wZQJxLCyGSvP7E6C0k3YGY1bQbnprR4OoIf ojJKPhQY.kvXW6itVaUvdNxOp8DsghfGguKU_Jrq_wazcsMSAdnh_plnpkXNxD4biZW_K55e1iGr XP1y7hPjjkGt7MAyWlaioARSPdaIsRE.dUihOQgnmrdRxVCsk5TO35iTawZknYdpeBfiAQoArv3p hqOb6r67564KF.nHTHRnK7bUGroHPh2QeFkJ4xGYAP9cu3xhgVDnbBVkcJGFkHCV7s0y5y4N8unf mVksIxzjlVHEZ1aJABS4AqKn2QJE0hZihVm_sIDPuIMSH0URF5HRLdmfU4yMvlzzK8rN.9Jl23qY zI3df62unut4mW2D1oOq2fOcVg3Oummfzb3bOjnTGtAzG6bpda6r4J.1qMV4zh3JHcmEgCa5qpZZ jLsPQkEI2UFyIBCqqu9ejQ1ozC4DDyhPqOHhQgacO9Meq2VImqjwb2SJrqkx.a2TImNuNV4qQgg0 Ta9CEYhFr9XYjou05zz7FuqlWDk_4e.MnBJdXuZa4HcqzOVlnVzNLAKHKO01EMB7xWA5ALonmjdZ I7qzdL6vHrQhD0K0tlS9Sk_2Hslj.0LhCkNQiNNhpmJFPpPuu9nmfrX2CuH1J4bE7b3HMjknHjoL qHIlncGVpOA8ezx1yX5jUW3s6BY5ykfEtbmqdUISd7bcafc3065UDd8uaGOx3xQInEqcAb0JzTWy C2nsDxctMjWDnre1Qkh5.xfwOLueu.wq2s0tRoh0hcm3UqaQ2Sd.gHsLwtRMtiYhkk._fZdINH74 za7TyJUscNGkJRWwRvDuFbRo3aii7vPKzCVRR8cbXYEtUwbUWZOC8Kws8ZmhcKGWczrfYAdmK1Wm SJB98Ksnl3c2EsCZtGdWrjrDLqkpHkNsuCZeQEnYfhTgiYmSg4QCp6KndSSWeDnxrqT3SxBsjVT_ hps1exGt7q4ihucJ0rO6xNpfFvQmql4.mCgjKLcV.0okJPgl1jM_rgfmrjwHfIYODPWkmVJUKzL_ wpFLWgesck_gP_XDcc017cg7y9L6l8K8LNtCHta7P0KyGQMfJ33eipENndI2XZP26QwWiqBgxJ74 epWHS0fSnKWWkrxz3jlmPcmHGMSUbRkBdxxs7K38Lstrc2G.EK3uTr8zY4qqx3JynZJvabpkOmPs fPhGAU9CCfrO4K9AqGn3gL773udzfDjgJiGOZrvro4OV04EdpPvHdpnMcyxJbhduJYACUxqva79V lDEtgpvdQ6IgyxR9wnAbKvn13hajj1HG7rvEgE9I5bgsCNafR.7_wri2o86HB6n86EAKns3fWZN3 eUXB.Q4uAilLXiyPBPHDbOWVfXHky3IjgP8Si_UhgTulw1c72vAa0Y_vTCUXaSNRW6G3VdvwEJan yoZRnC6sVwSBecI7DCKWhA733et7C93ei.M6nn3yd_MlwqS_6Nbu_Q46WAqVE5lwWbph.24Ro3E0 IHGQmaYeJEx2pTP1wg6wWsyk_mRMszlO7ovUgX.F_xNJQmPlN2WKYB7c8XzgJ81yEkfuxbyMiEKR lYy81UsdOBARMx5GgyUK0S1NXZKjLbANm5ONpkui9tprrb_KstwW2VeCrfe5W X-Sonic-MF: Received: from sonic.gate.mail.ne1.yahoo.com by sonic305.consmr.mail.gq1.yahoo.com with HTTP; Thu, 1 Apr 2021 08:38:05 +0000 Received: by kubenode548.mail-prod1.omega.bf1.yahoo.com (VZM Hermes SMTP Server) with ESMTPA ID e802fedec68ec9b16ee6df3ad278b60a; Thu, 01 Apr 2021 08:38:00 +0000 (UTC) Content-Type: text/plain; charset=utf-8 Mime-Version: 1.0 (Mac OS X Mail 14.0 \(3654.60.0.2.21\)) Subject: Re: Ports Repocopies From: Mark Millard In-Reply-To: <20210401075841.xot2c427twdbxo5a@aching.in.mat.cc> Date: Thu, 1 Apr 2021 01:37:57 -0700 Cc: Cy Schubert , freebsd-git Content-Transfer-Encoding: quoted-printable Message-Id: <583A7D01-9CAB-4C42-962A-BBDDBDED494E@yahoo.com> References: <202103311842.12VIgiJ3006095@slippy.cwsent.com> <20210401075841.xot2c427twdbxo5a@aching.in.mat.cc> To: Mathieu Arnold X-Mailer: Apple Mail (2.3654.60.0.2.21) X-Rspamd-Queue-Id: 4F9xQl4HV3z3Byn X-Spamd-Bar: ---- X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[] 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: Thu, 01 Apr 2021 08:38:08 -0000 On 2021-Apr-1, at 00:58, Mathieu Arnold wrote: > On Wed, Mar 31, 2021 at 11:42:44AM -0700, Cy Schubert wrote: >> Hi, >>=20 >> Considering git's non-existent copy function, is it safe to say ports=20= >> repopcopies are now a thing of the past? >=20 > Note that we stopped doing repocopies when we switched to subversion = in > 2012. Terminology mismatch vs. committers-guide? https://docs.freebsd.org/en/articles/committers-guide/ has use of "repo copy" terminology: QUOTE 22.4. Repository Copies 22.4.1. When do we need a repository copy? When you want to add a port that is related to any port that is already = in the tree in a separate directory, you have to do a repository copy. = Here related means it is a different version or a slightly modified = version. Examples are print/ghostscript* (different versions) and = x11-wm/windowmaker* (English-only and internationalized version). Another example is when a port is moved from one subdirectory to = another, or when the name of a directory must be changed because the = authors renamed their software even though it is a descendant of a port = already in a tree. 22.4.2. What do I need to do? With Subversion, a repo copy can be done by any committer: =E2=80=A2 Doing a repo copy: =E2=80=A2 Verify that the target directory does not exist. =E2=80=A2 Use svn up to make certain the original files, = directories, and checkout information is current. =E2=80=A2 Use svn move or svn copy to do the repo copy. =E2=80=A2 Upgrade the copied port to the new version. Remember = to add or change the PKGNAMEPREFIX or PKGNAMESUFFIX so there are no = duplicate ports with the same name. In some rare cases it may be = necessary to change the PORTNAME instead of adding PKGNAMEPREFIX or = PKGNAMESUFFIX, but this is only done when it is really needed =E2=80=94 = for example, using an existing port as the base for a very similar = program with a different name, or upgrading a port to a new upstream = version which actually changes the distribution name, like the = transition from textproc/libxml to textproc/libxml2. In most cases, = adding or changing PKGNAMEPREFIX or PKGNAMESUFFIX suffices. =E2=80=A2 Add the new subdirectory to the SUBDIR listing in the = parent directory Makefile. You can run make checksubdirs in the parent = directory to check this. =E2=80=A2 If the port changed categories, modify the CATEGORIES = line of the port=E2=80=99s Makefile accordingly =E2=80=A2 Add an entry to ports/MOVED, if you remove the = original port. =E2=80=A2 Commit all changes on one commit. =E2=80=A2 When removing a port: =E2=80=A2 Perform a thorough check of the ports collection for = any dependencies on the old port location/name, and update them. Running = grep on INDEX is not enough because some ports have dependencies enabled = by compile-time options. A full grep -r of the ports collection is = recommended. =E2=80=A2 Remove the old port and the old SUBDIR entry. =E2=80=A2 Add an entry to ports/MOVED. =E2=80=A2 After repo moves (=E2=80=9Crename=E2=80=9D operations = where a port is copied and the old location is removed): =E2=80=A2 Follow the same steps that are outlined in the = previous two entries, to activate the new location of the port and = remove the old one. END QUOTE > If you are talking about doing a svn copy/move to record the ancestry = of > a new file, you don't any more, git does not record file moves or > copies. >=20 > If you are talking about the resurrection of a port, it would be > possible to achieve the conservation of history by creating a branch > before the port was removed, updating the port, and merging it back = into > the main branch using a merge strategy keeping the files on the branch > being merged. But it would probably make reading the logs very ugly, = and > add merges everywhere, which we don't want anyway. >=20 =3D=3D=3D Mark Millard marklmi at yahoo.com ( dsl-only.net went away in early 2018-Mar)