-----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 <gokt...@binghamton.edu> >> >> 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: </p> >> >> <p> -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 <uri >> link="#adding-a-new-ebuild">new ebuild</uri>. </p> @@ -323,23 >> +323,17 @@ for <path>net-firewall/fwbuilder</path> when they are >> available. >> >> <p> Once this step is concluded, you are allowed to remove the >> old package. -Simply issue a <c>cvs remove -Rf $PN</c> in the >> package category and commit +Simply issue a <c>git rm -rf $PN</c> >> 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. </p> >> >> <pre caption="Removing a package"> -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." </pre> >> >> -<note> -CVS cannot destroy directories: it will simply not >> re-create them if -they are blank, providing you use CVS with the >> <c>-P</c> flag. -</note> - </body> </section> >> >> > > 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-----
