diff --git a/en_US.ISO8859-1/articles/committers-guide/article.sgml b/en_US.ISO8859-1/articles/committers-guide/article.sgml index 4304bd34a2..6c6bed5d3c 100644 --- a/en_US.ISO8859-1/articles/committers-guide/article.sgml +++ b/en_US.ISO8859-1/articles/committers-guide/article.sgml @@ -583,11 +583,11 @@ You will almost certainly get a conflict because - of the $Id: article.sgml,v 1.115 2002-05-11 14:06:54 keramida Exp $ (or in FreeBSD's case, + of the $Id: article.sgml,v 1.116 2002-05-11 23:32:01 jedgar Exp $ (or in FreeBSD's case, $FreeBSD$) lines, so you will have to edit the file to resolve the conflict (remove the marker lines and - the second $Id: article.sgml,v 1.115 2002-05-11 14:06:54 keramida Exp $ line, leaving the original - $Id: article.sgml,v 1.115 2002-05-11 14:06:54 keramida Exp $ line intact). + the second $Id: article.sgml,v 1.116 2002-05-11 23:32:01 jedgar Exp $ line, leaving the original + $Id: article.sgml,v 1.116 2002-05-11 23:32:01 jedgar Exp $ line intact). @@ -2228,6 +2228,27 @@ docs:Documentation Bug:nik: wra(i)th. + + + + What is proper procedure for updating checksum for a + port's distfile when the file changes without a version + change? + + + + 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. + +