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 DB661139890 for ; Fri, 21 Aug 2015 06:36:50 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 48F5AE07F2; Fri, 21 Aug 2015 06:36:49 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id DC1F5E07F1 for ; Fri, 21 Aug 2015 06:36:48 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id DC4963406C0 for ; Fri, 21 Aug 2015 06:36:47 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id A3093129 for ; Fri, 21 Aug 2015 06:36:45 +0000 (UTC) From: "Justin Lecher" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Justin Lecher" Message-ID: <1440062106.8fdfbd22b2c3b2863d351ec97322c06cbd29e2ba.jlec@gentoo> Subject: [gentoo-commits] proj/devmanual:master commit in: ebuild-writing/misc-files/patches/ X-VCS-Repository: proj/devmanual X-VCS-Files: ebuild-writing/misc-files/patches/text.xml X-VCS-Directories: ebuild-writing/misc-files/patches/ X-VCS-Committer: jlec X-VCS-Committer-Name: Justin Lecher X-VCS-Revision: 8fdfbd22b2c3b2863d351ec97322c06cbd29e2ba X-VCS-Branch: master Date: Fri, 21 Aug 2015 06:36:45 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: e3cc9ead-bbe4-4bc9-8129-9e5fdd157dd5 X-Archives-Hash: 114b3e06a4f5d1b4a4cb1e218fbc30d6 commit: 8fdfbd22b2c3b2863d351ec97322c06cbd29e2ba Author: Johannes Huber gentoo org> AuthorDate: Thu Aug 20 09:15:06 2015 +0000 Commit: Justin Lecher gentoo org> CommitDate: Thu Aug 20 09:15:06 2015 +0000 URL: https://gitweb.gentoo.org/proj/devmanual.git/commit/?id=8fdfbd22 Update patches Due to git migration. ebuild-writing/misc-files/patches/text.xml | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/ebuild-writing/misc-files/patches/text.xml b/ebuild-writing/misc-files/patches/text.xml index 0be488c..cd85244 100644 --- a/ebuild-writing/misc-files/patches/text.xml +++ b/ebuild-writing/misc-files/patches/text.xml @@ -18,7 +18,7 @@ is conventional. Patches are best named ${P}-what-it-does.patch (or description of what the patch is for. If the patch is to fix a specific bug, it is often useful to add in the bug number for example, vim-7.0-cron-vars-79981.patch. If the patch is pulled from -upstream's CVS / SVN repository, it can help to include the revision +upstream's VCS repository, it can help to include the revision number in the patch name as a suffix to the version part fluxbox-0.9.12-3860-menu-backups.patch.

@@ -57,7 +57,7 @@ later. Good things to include in comments are: What the patch actually does. Bug numbers are good here.
  • - Where the patch came from. Is it an upstream CVS/SVN pull, + Where the patch came from. Is it an upstream VCS pull, something from Bugzilla, something you wrote?
  • @@ -107,20 +107,16 @@ from the vim patch tarball:

    When adding a patch to the tree be sure to check that the patch doesn't have -CVS keywords in it that will be expanded (such as $Id$). If the patch +Git keywords in it that will be expanded (such as $Id$). If the patch contains these, it will break manifests unless you add it to the tree -correctly. In the case that it does have the keywords, you should add it by -doing: +correctly. In the case that it does have the keywords, you should remove them. +Afterwards they can be added like every other file: 

    -cvs add -ko files/${P}-the-cool-patch.patch
+git add files/${P}-the-cool-patch.patch
    -

    --ko disables keyword expansion for that specific file. If it doesn't -have keywords in it, then you can add it normally without the extra argument. -