public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Ulrich Müller" <ulm@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] proj/devmanual:master commit in: ebuild-maintenance/
Date: Fri,  5 Feb 2016 12:59:18 +0000 (UTC)	[thread overview]
Message-ID: <1454677100.1ea5569645f171c2f60a3cbdb987c23ddfe7cccf.ulm@gentoo> (raw)

commit:     1ea5569645f171c2f60a3cbdb987c23ddfe7cccf
Author:     Gokturk Yuksek <gokturk <AT> binghamton <DOT> edu>
AuthorDate: Thu Feb  4 00:57:37 2016 +0000
Commit:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Fri Feb  5 12:58:20 2016 +0000
URL:        https://gitweb.gentoo.org/proj/devmanual.git/commit/?id=1ea55696

ebuild-maintenance: rewrite the subsection on commit policy for git #558642

Remove the mention of updating the ChangeLog.
Remove the mention of file conflicts during commit as CVS keeps track of
files whereas git keeps track of changesets.

Add a note regarding commit atomicity: Git commits are always atomic, so
combining package.mask/license changes with ebuild changes in the same
commit does not violate atomicity. However, there is no way to accomplish
this using repoman commit.

Gentoo-Bug: https://bugs.gentoo.org/show_bug.cgi?id=558642
Signed-off-by: Gokturk Yuksek <gokturk <AT> binghamton.edu>

 ebuild-maintenance/text.xml | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/ebuild-maintenance/text.xml b/ebuild-maintenance/text.xml
index 3cefdc2..9372895 100644
--- a/ebuild-maintenance/text.xml
+++ b/ebuild-maintenance/text.xml
@@ -96,7 +96,7 @@ work on those architectures.
 </subsection>
 
 <subsection>
-<title>CVS Commit Policy</title>
+<title>Git Commit Policy</title>
 <body>
 
 <ul>
@@ -105,15 +105,18 @@ work on those architectures.
 <li>Always test that <path>package.mask</path> is okay by doing 
 <c>emerge --pretend mypkg</c> before you commit and check 
 that it doesn't contain any conflicts.</li>
-<li>Always update the <path>ChangeLog</path> before you commit.</li>
-<li>Always commit the updated <path>package.mask</path> before 
-the updated package, in case conflicts occur while you commit 
-<path>package.mask</path>.</li>
+<li>Always commit the updated <path>package.mask</path> before
+the updated package.</li>
 <li>Always do atomic commits; if you commit a package with a new license, 
 or that is masked, then first commit the revised <path>package.mask</path> and/or license, 
 then commit the ebuild, <path>ChangeLog</path>, patches
 and <uri link="::ebuild-writing/misc-files/metadata">metadata.xml</uri> all in <b>one</b> go
-to avoid breaking users' installations.</li>
+.</li>
+<note> Although the set of changes in a single git commit is atomic, and
+combining <path>package.mask</path>/license changes with ebuild changes in a
+single commit wouldn't break atomicity, it is not currently possible to do so
+using <c>repoman commit</c>.</note>
+<!-- See: https://bugs.gentoo.org/show_bug.cgi?id=390651 -->
 </ul>
 
 </body>


             reply	other threads:[~2016-02-05 12:59 UTC|newest]

Thread overview: 21+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-02-05 12:59 Ulrich Müller [this message]
  -- strict thread matches above, loose matches on Subject: below --
2020-01-23  8:40 [gentoo-commits] proj/devmanual:master commit in: ebuild-maintenance/ Ulrich Müller
2017-09-25  4:40 Göktürk Yüksek
2017-09-25  4:40 Göktürk Yüksek
2017-07-29 20:48 Göktürk Yüksek
2017-01-22 20:45 Göktürk Yüksek
2016-11-20 20:46 Göktürk Yüksek
2016-08-18  9:01 Ulrich Müller
2016-05-22  8:35 Ulrich Müller
2016-05-01  3:49 Göktürk Yüksek
2016-04-24  0:47 Göktürk Yüksek
2016-04-23 19:26 Göktürk Yüksek
2016-04-19 10:40 Ulrich Müller
2016-02-05 12:59 Ulrich Müller
2016-02-05 12:59 Ulrich Müller
2016-02-05 12:59 Ulrich Müller
2016-02-05 12:59 Ulrich Müller
2016-02-05 12:59 Ulrich Müller
2016-02-05 12:59 Ulrich Müller
2016-02-05 12:59 Ulrich Müller
2015-05-09 15:22 Ulrich Müller

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1454677100.1ea5569645f171c2f60a3cbdb987c23ddfe7cccf.ulm@gentoo \
    --to=ulm@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox