| 1 |
Remove the mention of updating the ChangeLog. |
| 2 |
Remove the mention of file conflicts during commit as CVS keeps track of |
| 3 |
files whereas git keeps track of changesets. |
| 4 |
|
| 5 |
Add a note regarding commit atomicity: Git commits are always atomic, so |
| 6 |
combining package.mask/license changes with ebuild changes in the same |
| 7 |
commit does not violate atomicity. However, there is no way to accomplish |
| 8 |
this using repoman commit. |
| 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 b/ebuild-maintenance/text.xml |
| 14 |
index 10709ea..2d46749 100644 |
| 15 |
--- a/ebuild-maintenance/text.xml |
| 16 |
+++ b/ebuild-maintenance/text.xml |
| 17 |
@@ -96,7 +96,7 @@ work on those architectures. |
| 18 |
</subsection> |
| 19 |
|
| 20 |
<subsection> |
| 21 |
-<title>CVS Commit Policy</title> |
| 22 |
+<title>Git Commit Policy</title> |
| 23 |
<body> |
| 24 |
|
| 25 |
<ul> |
| 26 |
@@ -105,15 +105,18 @@ work on those architectures. |
| 27 |
<li>Always test that <path>package.mask</path> is okay by doing |
| 28 |
<c>emerge --pretend mypkg</c> before you commit and check |
| 29 |
that it doesn't contain any conflicts.</li> |
| 30 |
-<li>Always update the <path>ChangeLog</path> before you commit.</li> |
| 31 |
-<li>Always commit the updated <path>package.mask</path> before |
| 32 |
-the updated package, in case conflicts occur while you commit |
| 33 |
-<path>package.mask</path>.</li> |
| 34 |
+<li>Always commit the updated <path>package.mask</path> before |
| 35 |
+the updated package.</li> |
| 36 |
<li>Always do atomic commits; if you commit a package with a new license, |
| 37 |
or that is masked, then first commit the revised <path>package.mask</path> and/or license, |
| 38 |
then commit the ebuild, <path>ChangeLog</path>, patches |
| 39 |
and <uri link="::ebuild-writing/misc-files/metadata">metadata.xml</uri> all in <b>one</b> go |
| 40 |
-to avoid breaking users' installations.</li> |
| 41 |
+.</li> |
| 42 |
+<note> Although the set of changes in a single git commit is atomic, and |
| 43 |
+combining <path>package.mask</path>/license changes with ebuild changes in a |
| 44 |
+single commit wouldn't break atomicity, it is not currently possible to do so |
| 45 |
+using <c>repoman commit</c>.</note> |
| 46 |
+<!-- See: https://bugs.gentoo.org/show_bug.cgi?id=390651 --> |
| 47 |
</ul> |
| 48 |
|
| 49 |
</body> |
| 50 |
-- |
| 51 |
2.4.10 |
Archives