| 1 |
-----BEGIN PGP SIGNED MESSAGE----- |
| 2 |
Hash: SHA512 |
| 3 |
|
| 4 |
Michael Palimaka: |
| 5 |
> On 01/17/2016 06:55 PM, Gokturk Yuksek wrote: |
| 6 |
>> Substitute the mentions of CVS with git. Rewrite CVS commands |
| 7 |
>> with their git equivalents. Remove the paragraph about deleting |
| 8 |
>> directories in CVS. |
| 9 |
>> |
| 10 |
>> X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=558642 |
| 11 |
>> Signed-off-by: Gokturk Yuksek <gokturk@××××××××××.edu> |
| 12 |
>> |
| 13 |
>> diff --git a/ebuild-maintenance/text.xml |
| 14 |
>> b/ebuild-maintenance/text.xml index a1d92a1..8c542d0 100644 --- |
| 15 |
>> a/ebuild-maintenance/text.xml +++ b/ebuild-maintenance/text.xml |
| 16 |
>> @@ -298,7 +298,7 @@ Moving ebuilds is a two-step process: </p> |
| 17 |
>> |
| 18 |
>> <p> -Firstly, you need to move the ebuild in CVS. To do this, you |
| 19 |
>> should +Firstly, you need to move the ebuild in the git tree. To |
| 20 |
>> do this, you should copy the ebuild to its new location and |
| 21 |
>> commit that as you would with a <uri |
| 22 |
>> link="#adding-a-new-ebuild">new ebuild</uri>. </p> @@ -323,23 |
| 23 |
>> +323,17 @@ for <path>net-firewall/fwbuilder</path> when they are |
| 24 |
>> available. |
| 25 |
>> |
| 26 |
>> <p> Once this step is concluded, you are allowed to remove the |
| 27 |
>> old package. -Simply issue a <c>cvs remove -Rf $PN</c> in the |
| 28 |
>> package category and commit +Simply issue a <c>git rm -rf $PN</c> |
| 29 |
>> in the package category and commit the changes afterwards with a |
| 30 |
>> meaningful commit message. Don't forget to update entries in |
| 31 |
>> files such as profiles/package.mask to reflect the new category. |
| 32 |
>> Finally remember to change the title to open bugs related to this |
| 33 |
>> package if needed. </p> |
| 34 |
>> |
| 35 |
>> <pre caption="Removing a package"> -net-misc # cvs rm -Rf |
| 36 |
>> fwbuilder -cvs remove: use `cvs commit' to remove these files |
| 37 |
>> permanently -net-misc # cvs ci -m "Moving net-misc/fwbuilder to |
| 38 |
>> net-firewall/fwbuilder." +net-misc # git rm -rf fwbuilder |
| 39 |
>> +net-misc # git commit --gpg-sign -m "Moving net-misc/fwbuilder |
| 40 |
>> to net-firewall/fwbuilder." </pre> |
| 41 |
>> |
| 42 |
>> -<note> -CVS cannot destroy directories: it will simply not |
| 43 |
>> re-create them if -they are blank, providing you use CVS with the |
| 44 |
>> <c>-P</c> flag. -</note> - </body> </section> |
| 45 |
>> |
| 46 |
>> |
| 47 |
> |
| 48 |
> How about git mv instead? |
| 49 |
> |
| 50 |
> |
| 51 |
The workflow in the devmanual is: copy-mask-remove. |
| 52 |
Git mv workflow is similar to: copy-remove-mask. |
| 53 |
If encapsulated in a single commit, the atomicity is preserved and it |
| 54 |
shouldn't violate anything. I actually wrote it using git mv first and |
| 55 |
rewrote to match the current workflow of devmanual. |
| 56 |
|
| 57 |
If there is no objection to this, I'll rewrite it with git mv. |
| 58 |
|
| 59 |
- -- |
| 60 |
gokturk |
| 61 |
|
| 62 |
-----BEGIN PGP SIGNATURE----- |
| 63 |
|
| 64 |
iQEcBAEBCgAGBQJWnBBbAAoJEIT4AuXAiM4zD0YIAM3oUGd5woCtq4/Xou5+R86D |
| 65 |
6ofPQQTsjZ7C/GE9dImmch0Mn1iG2Pt8kxP1G/M9br0Vs8D7qPQFO+5Xmm+SBhO7 |
| 66 |
8s0KSwYnipWqzEKuDtbNwBXJ2mj9eG/0NQKdOXbxKWWk/QMewy+DSqZekiQaL512 |
| 67 |
JmacEPm/TzAukYQqpwx8rGw3kp+Nz7v+TTQ47epElQ/wnRPZyU05JPyeYFbsV97y |
| 68 |
aG17JIRx+FnL6rOKJJE/pyZ3Bbqu1autkgw0cL9Wk5EdxVm3WeR/nHj847EcziTd |
| 69 |
Ws312So+GEhb2smFdLxXBN6y/tiTb1xeeNds2sMsSu2KNfNN3E7VWOXSsjK8mMI= |
| 70 |
=SuBZ |
| 71 |
-----END PGP SIGNATURE----- |
Archives