os/doc
3
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Add an entry to the Ports-specific FAQ describing what to do when a

Browse source 
distfile changes without a version change (with some help by Dima).

Reviewed by:	dd
This commit is contained in:
Chris D. Faulhaber 2002-05-11 23:32:01 +00:00
parent 8c8493e1b2
commit 906ef8159a
Notes: svn2git 2020-12-08 03:00:23 +00:00 
svn path=/head/; revision=13041
1 changed files with 24 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
en_US.ISO8859-1/articles/committers-guide/article.sgml
View file

@ -583,11 +583,11 @@
</itemizedlist>
<para>You will almost certainly get a conflict because
of the <literal>$Id: article.sgml,v 1.115 2002-05-11 14:06:54 keramida Exp $</literal> (or in FreeBSD's case,
of the <literal>$Id: article.sgml,v 1.116 2002-05-11 23:32:01 jedgar Exp $</literal> (or in FreeBSD's case,
<literal>$<!-- stop expansion -->FreeBSD<!-- stop expansion -->$</literal>) lines, so you will have to edit
the file to resolve the conflict (remove the marker lines and
the second <literal>$Id: article.sgml,v 1.115 2002-05-11 14:06:54 keramida Exp $</literal> line, leaving the original
<literal>$Id: article.sgml,v 1.115 2002-05-11 14:06:54 keramida Exp $</literal> line intact).</para>
the second <literal>$Id: article.sgml,v 1.116 2002-05-11 23:32:01 jedgar Exp $</literal> line, leaving the original
<literal>$Id: article.sgml,v 1.116 2002-05-11 23:32:01 jedgar Exp $</literal> line intact).</para>
</listitem>
<listitem>
@ -2228,6 +2228,27 @@ docs:Documentation Bug:nik:</programlisting>
wra(i)th.</para>
</answer>
</qandaentry>
<qandaentry>
<question>
<para>What is proper procedure for updating checksum for a
port's distfile when the file changes without a version
change?</para>
</question>
<answer>
<para>When the checksum for a port's distfile is updated due
to the author updating the file without changing the port's
revision, the commit message should include a summary of
the relevant diffs between the original and new distfile to
ensure that the distfile has not been corrupted or
maliciously altered. If the current version of the port
has been in the ports tree for a while, a copy of the old
distfile will usually be available on the ftp servers;
otherwise the author or maintainer should be contacted to
find out why the distfile has changed.</para>
</answer>
</qandaentry>
</qandadiv>
</qandaset>
</sect1>