From: Patrice Clement <monsieurp@gentoo.org>
To: gentoo-dev@lists.gentoo.org
Cc: devmanual@gentoo.org
Subject: Re: [gentoo-dev] [PATCH v2 08/19] ebuild-maintenance: rewrite the text on adding binary files to the tree #558642
Date: Sun, 24 Jan 2016 16:00:31 +0100 [thread overview]
Message-ID: <20160124150031.GH6302@ultrachro.me> (raw)
In-Reply-To: <1453625173-9505-9-git-send-email-gokturk@binghamton.edu>
Sunday 24 Jan 2016 03:46:02, Gokturk Yuksek wrote :
> Remove the paragraph about adding binary files to CVS.
> Replace the instances of CVS with git.
>
> X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=558642
> Signed-off-by: Gokturk Yuksek <gokturk@binghamton.edu>
> ---
> ebuild-maintenance/text.xml | 19 +++----------------
> 1 file changed, 3 insertions(+), 16 deletions(-)
>
> diff --git a/ebuild-maintenance/text.xml b/ebuild-maintenance/text.xml
> index ac68dcd..10709ea 100644
> --- a/ebuild-maintenance/text.xml
> +++ b/ebuild-maintenance/text.xml
> @@ -42,22 +42,9 @@ above 20KB) which should be distributed as tarballs via the
> <uri link="::general-concepts/mirrors/#suitable-download-hosts">Gentoo mirror system</uri>
> so that people do not waste excessive amounts of bandwidth and hard drive
> space. Also, you should not add binary (non-ASCII) files to the
> -Portage CVS tree. If you need to do this in another CVS tree, for
> -example, if you need to add a small PNG graphic for whatever reason,
> -be sure to add it to CVS by using the <c>-kb</c> option, like so:
> -</p>
> -
> -<pre caption="Adding binary files to CVS">
> -# <i>cvs add -kb myphoto.png</i>
> -</pre>
> -
> -<p>
> -The <c>-kb</c> option tells CVS that <path>myphoto.png</path> is a binary
> -file and should be treated specially. For example, merging the
> -differences between two different versions of this file should not be
> -allowed to happen, for obvious reasons. Also, speaking of merging
> +git tree. Also, speaking of merging
> changes, any patches you add to Portage should generally <e>not</e> be
> -compressed. This will allow CVS to merge changes and correctly inform
> +compressed. This will allow git to merge changes and correctly inform
> developers of conflicts.
> </p>
>
> @@ -149,7 +136,7 @@ simply, <path>1.0-gentoo.diff</path>. Also note that the
> <path>gentoo</path> extension informs people that this patch was created
> by us, the Gentoo Linux developers, rather than having been grabbed from a
> mailing list or somewhere else. Again, you should not compress these
> -patches because CVS does not play well with binary files.
> +patches because git does not play well with binary files.
> </p>
>
> <p>
> --
> 2.4.10
>
>
"Again you should not compress these patches because git does not play well
binary files".
I'm not sure this statement still holds true with git. Does it?
--
Patrice Clement
Gentoo Linux developer
http://www.gentoo.org
next prev parent reply other threads:[~2016-01-24 15:00 UTC|newest]
Thread overview: 33+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-01-24 8:45 [gentoo-dev] [PATCH v2 00/19] devmanual: update the docs for post git-migration Gokturk Yuksek
2016-01-24 8:45 ` [gentoo-dev] [PATCH v2 01/19] general-concepts/manifest: drop the use of "CVS keyword expansion" #558642 Gokturk Yuksek
2016-01-24 8:45 ` [gentoo-dev] [PATCH v2 02/19] general-concepts/mirrors: substitute "CVS" with "the git tree" #558642 Gokturk Yuksek
2016-01-24 8:45 ` [gentoo-dev] [PATCH v2 03/19] general-concepts/tree: substitute "CVS" with "git" #558642 Gokturk Yuksek
2016-01-24 8:45 ` [gentoo-dev] [PATCH v2 04/19] general-concepts/tree: replace the mention of ChangeLog #558642 Gokturk Yuksek
2016-01-24 8:45 ` [gentoo-dev] [PATCH v2 05/19] ebuild-writing/misc-files: replace the code for cvs commit with git #558642 Gokturk Yuksek
2016-01-24 8:46 ` [gentoo-dev] [PATCH v2 06/19] ebuild-writing/user-submitted: do not put user information in ChangeLog #558642 Gokturk Yuksek
2016-01-24 8:46 ` [gentoo-dev] [PATCH v2 07/19] appendices/editor-configuration/emacs: remove the CVS related setting #558642 Gokturk Yuksek
2016-01-24 8:46 ` [gentoo-dev] [PATCH v2 08/19] ebuild-maintenance: rewrite the text on adding binary files to the tree #558642 Gokturk Yuksek
2016-01-24 15:00 ` Patrice Clement [this message]
2016-01-24 15:29 ` [gentoo-dev] " Duncan
2016-01-24 15:44 ` [gentoo-dev] " Andrew Savchenko
2016-01-24 23:44 ` Göktürk Yüksek
2016-01-25 0:51 ` Brian Dolbec
2016-01-24 16:38 ` Göktürk Yüksek
2016-01-24 17:17 ` James Le Cuirot
2016-01-24 8:46 ` [gentoo-dev] [PATCH v2 09/19] ebuild-maintenance: rewrite the subsection on commit policy for git #558642 Gokturk Yuksek
2016-01-24 8:46 ` [gentoo-dev] [PATCH v2 10/19] ebuild-maintenance: rewrite the subsection on upgrading ebuilds " Gokturk Yuksek
2016-01-24 8:46 ` [gentoo-dev] [PATCH v2 11/19] ebuild-maintenance: rewrite the subsection on moving " Gokturk Yuksek
2016-01-24 8:46 ` [gentoo-dev] [PATCH v2 12/19] ebuild-maintenance: rewrite the subsection on removing " Gokturk Yuksek
2016-01-24 8:46 ` [gentoo-dev] [PATCH v2 13/19] ebuild-maintenance: rewrite the subsection on removing packages " Gokturk Yuksek
2016-01-24 8:46 ` [gentoo-dev] [PATCH v2 14/19] ebuild-maintenance: replace "cvs commit" with "git commit" #558642 Gokturk Yuksek
2016-01-24 8:46 ` [gentoo-dev] [PATCH v2 15/19] general-concepts/git-to-rsync/diagram: update the description for git #558642 Gokturk Yuksek
2016-01-24 8:46 ` [gentoo-dev] [PATCH v2 16/19] " Gokturk Yuksek
2016-01-24 8:46 ` [gentoo-dev] [PATCH v2 17/19] ebuild-writing/misc-files: remove ChangeLog section #485314 Gokturk Yuksek
2016-01-25 0:43 ` [gentoo-dev] " Ulrich Mueller
2016-01-25 1:02 ` Göktürk Yüksek
2016-01-25 1:13 ` Michael Orlitzky
2016-01-25 8:17 ` Ulrich Mueller
2016-01-27 4:19 ` Göktürk Yüksek
2016-01-27 7:12 ` Ulrich Mueller
2016-01-24 8:46 ` [gentoo-dev] [PATCH v2 18/19] tools-reference: remove the echangelog page #485314 Gokturk Yuksek
2016-01-24 8:46 ` [gentoo-dev] [PATCH v2 19/19] general-concepts/tree: remove the reference to the ChangeLog #485314 Gokturk Yuksek
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=20160124150031.GH6302@ultrachro.me \
--to=monsieurp@gentoo.org \
--cc=devmanual@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