From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 77CD758973 for ; Sun, 17 Jan 2016 22:06:39 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 8FAB121C020; Sun, 17 Jan 2016 22:06:30 +0000 (UTC) Received: from out5-smtp.messagingengine.com (out5-smtp.messagingengine.com [66.111.4.29]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id B16C021C00C for ; Sun, 17 Jan 2016 22:06:29 +0000 (UTC) Received: from compute5.internal (compute5.nyi.internal [10.202.2.45]) by mailout.nyi.internal (Postfix) with ESMTP id 453B320450 for ; Sun, 17 Jan 2016 17:06:29 -0500 (EST) Received: from frontend1 ([10.202.2.160]) by compute5.internal (MEProxy); Sun, 17 Jan 2016 17:06:29 -0500 DKIM-Signature: v=1; a=rsa-sha1; c=relaxed/relaxed; d= messagingengine.com; h=content-transfer-encoding:content-type :date:from:in-reply-to:message-id:mime-version:references :subject:to:x-sasl-enc:x-sasl-enc; s=smtpout; bh=+q9U5S5rO6pnJjK yuXvT94gskHc=; b=YakkeRwqUbZh29wNwkHKwnlQN9ODrJYo55d9yZW5OzeQ1nZ e05f/aU4RuQYwsivJ1pENJSLnjb0ZjmyyvH9EZHNKwLYguwmx9kPaI2iskCxDTIm Gisl+KEfr1F5446urCitXfGYFYZGNR5I6k4Wck/1uSiqsQxHe6h5EXZFnXBs= X-Sasl-enc: rsO574LDLuLFFcCUlnOH8CoQT3MdSR018uj6G9yMG+V4 1453068388 Received: from 127.0.0.1 (unknown [50.7.178.100]) by mail.messagingengine.com (Postfix) with ESMTPA id 74875C016DB for ; Sun, 17 Jan 2016 17:06:28 -0500 (EST) Subject: Re: [gentoo-dev] Re: [PATCH 11/16] ebuild-maintenance: rewrite the subsection on moving ebuilds for git #558642 To: gentoo-dev@lists.gentoo.org References: <1453017319-2459-1-git-send-email-gokturk@binghamton.edu> <1453017319-2459-12-git-send-email-gokturk@binghamton.edu> From: =?UTF-8?B?R8O2a3TDvHJrIFnDvGtzZWs=?= Message-ID: <569C1062.1050709@binghamton.edu> Date: Sun, 17 Jan 2016 17:06:26 -0500 Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-dev@lists.gentoo.org Reply-to: gentoo-dev@lists.gentoo.org MIME-Version: 1.0 In-Reply-To: Content-Type: text/plain; charset=windows-1252 Content-Transfer-Encoding: 7bit X-Archives-Salt: 7a1fe38f-b726-4451-8116-467dc9fff665 X-Archives-Hash: 196aa7b9a2b47b722c68cd65eb13e326 -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA512 Michael Palimaka: > On 01/17/2016 06:55 PM, Gokturk Yuksek wrote: >> Substitute the mentions of CVS with git. Rewrite CVS commands >> with their git equivalents. Remove the paragraph about deleting >> directories in CVS. >> >> X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=558642 >> Signed-off-by: Gokturk Yuksek >> >> diff --git a/ebuild-maintenance/text.xml >> b/ebuild-maintenance/text.xml index a1d92a1..8c542d0 100644 --- >> a/ebuild-maintenance/text.xml +++ b/ebuild-maintenance/text.xml >> @@ -298,7 +298,7 @@ Moving ebuilds is a two-step process:

>> >>

-Firstly, you need to move the ebuild in CVS. To do this, you >> should +Firstly, you need to move the ebuild in the git tree. To >> do this, you should copy the ebuild to its new location and >> commit that as you would with a > link="#adding-a-new-ebuild">new ebuild.

@@ -323,23 >> +323,17 @@ for net-firewall/fwbuilder when they are >> available. >> >>

Once this step is concluded, you are allowed to remove the >> old package. -Simply issue a cvs remove -Rf $PN in the >> package category and commit +Simply issue a git rm -rf $PN >> in the package category and commit the changes afterwards with a >> meaningful commit message. Don't forget to update entries in >> files such as profiles/package.mask to reflect the new category. >> Finally remember to change the title to open bugs related to this >> package if needed.

>> >> 
 -net-misc # cvs rm -Rf
>> fwbuilder -cvs remove: use `cvs commit' to remove these files
>> permanently -net-misc # cvs ci -m "Moving net-misc/fwbuilder to
>> net-firewall/fwbuilder." +net-misc # git rm -rf fwbuilder 
>> +net-misc # git commit --gpg-sign -m "Moving net-misc/fwbuilder
>> to net-firewall/fwbuilder."
>> >> - -CVS cannot destroy directories: it will simply not >> re-create them if -they are blank, providing you use CVS with the >> -P flag. - - >> >> > > How about git mv instead? > > The workflow in the devmanual is: copy-mask-remove. Git mv workflow is similar to: copy-remove-mask. If encapsulated in a single commit, the atomicity is preserved and it shouldn't violate anything. I actually wrote it using git mv first and rewrote to match the current workflow of devmanual. If there is no objection to this, I'll rewrite it with git mv. - -- gokturk -----BEGIN PGP SIGNATURE----- iQEcBAEBCgAGBQJWnBBbAAoJEIT4AuXAiM4zD0YIAM3oUGd5woCtq4/Xou5+R86D 6ofPQQTsjZ7C/GE9dImmch0Mn1iG2Pt8kxP1G/M9br0Vs8D7qPQFO+5Xmm+SBhO7 8s0KSwYnipWqzEKuDtbNwBXJ2mj9eG/0NQKdOXbxKWWk/QMewy+DSqZekiQaL512 JmacEPm/TzAukYQqpwx8rGw3kp+Nz7v+TTQ47epElQ/wnRPZyU05JPyeYFbsV97y aG17JIRx+FnL6rOKJJE/pyZ3Bbqu1autkgw0cL9Wk5EdxVm3WeR/nHj847EcziTd Ws312So+GEhb2smFdLxXBN6y/tiTb1xeeNds2sMsSu2KNfNN3E7VWOXSsjK8mMI= =SuBZ -----END PGP SIGNATURE-----