From 9c2e90bea88e142658a324d7bebb030a1da1f207 Mon Sep 17 00:00:00 2001 From: Pav Lucistnik Date: Mon, 18 Jun 2007 09:34:27 +0000 Subject: [PATCH] - Document a policy to force commit to copied port after repocopy --- .../articles/committers-guide/article.sgml | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/en_US.ISO8859-1/articles/committers-guide/article.sgml b/en_US.ISO8859-1/articles/committers-guide/article.sgml index 0c2e51d054..4a9e52a111 100644 --- a/en_US.ISO8859-1/articles/committers-guide/article.sgml +++ b/en_US.ISO8859-1/articles/committers-guide/article.sgml @@ -731,11 +731,11 @@ alias scvs cvs -d user@ncvs.FreeBSD.org:/home/ncvs

You will almost certainly get a conflict because - of the $Id: article.sgml,v 1.261 2007-04-25 13:13:22 roam Exp $ (or in FreeBSD's case, + of the $Id: article.sgml,v 1.262 2007-06-18 09:34:27 pav 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.261 2007-04-25 13:13:22 roam Exp $ line, - leaving the original $Id: article.sgml,v 1.261 2007-04-25 13:13:22 roam Exp $ line intact). + (remove the marker lines and the second $Id: article.sgml,v 1.262 2007-06-18 09:34:27 pav Exp $ line, + leaving the original $Id: article.sgml,v 1.262 2007-06-18 09:34:27 pav Exp $ line intact). @@ -2546,6 +2546,11 @@ docs:Documentation Bug:freebsd-doc: When a port has been repo copied: + + Do a force commit on the files of the copied port, + stating repository copy was performed. + + Upgrade the copied port to the new version. Remember to change the LATEST_LINK