From 4b42f18b66e843f362e5e159d95fee9d2c26ef9c Mon Sep 17 00:00:00 2001 From: Evan Prodromou Date: Mon, 29 Nov 2004 18:25:30 +0000 Subject: [PATCH] Removed CVS keywords from files, to make merging between branches easier. Interpolated keywords cause lots of conflicts and headaches at merge time for older (<1.12.x) CVS versions. --- docs/design.doc | 7 +++++++ includes/Article.php | 2 -- includes/Block.php | 1 - includes/Database.php | 4 ---- includes/DatabaseFunctions.php | 1 - includes/DatabasePostgreSQL.php | 1 - includes/DefaultSettings.php | 1 - includes/EditPage.php | 1 - includes/Feed.php | 1 - includes/GlobalFunctions.php | 1 - includes/Image.php | 1 - includes/LogPage.php | 1 - includes/MessageCacheHints.php | 1 - includes/ObjectCache.php | 1 - includes/OutputPage.php | 1 - includes/Parser.php | 1 - includes/SearchUpdate.php | 1 - includes/SiteStatsUpdate.php | 1 - includes/SpecialRandompage.php | 1 - includes/Title.php | 1 - includes/ZhClient.php | 1 - languages/LanguageFr.php | 2 -- languages/LanguageLt.php | 3 +-- languages/LanguageSv.php | 2 -- languages/LanguageUtf8.php | 2 +- maintenance/InitialiseMessages.inc | 2 -- maintenance/parserTests.txt | 1 - maintenance/postgresql/pg_tables.sql | 1 - maintenance/postgresql/pg_users.sql | 1 - maintenance/refreshLinks.inc | 1 - skins/disabled/WikimediaWiki.php | 1 - soap/nusoap.php | 12 +----------- 32 files changed, 10 insertions(+), 49 deletions(-) diff --git a/docs/design.doc b/docs/design.doc index a0eb9baac7..af1ee3054a 100644 --- a/docs/design.doc +++ b/docs/design.doc @@ -117,3 +117,10 @@ Naming/coding conventions: of session variables are wsName, cookies wcName, and form field values wpName ("p" for "POST"). + - Be kind to your release manager and don't use CVS keywords (Id, + Revision, etc.) to mark file versions; they make merging code between + different branches a pain for older versions (<1.12.x) of CVS, and + are kind of sketchy for versions after that. + + + \ No newline at end of file diff --git a/includes/Article.php b/includes/Article.php index ae99a953d2..2a4f5e0e93 100644 --- a/includes/Article.php +++ b/includes/Article.php @@ -1,7 +1,6 @@ diff --git a/includes/GlobalFunctions.php b/includes/GlobalFunctions.php index f05e82dd28..0ab7818c30 100644 --- a/includes/GlobalFunctions.php +++ b/includes/GlobalFunctions.php @@ -1,5 +1,4 @@ # http://www.mediawiki.org/ diff --git a/includes/MessageCacheHints.php b/includes/MessageCacheHints.php index d84e247bee..582fec394c 100644 --- a/includes/MessageCacheHints.php +++ b/includes/MessageCacheHints.php @@ -2,7 +2,6 @@ /* * @package Mediawiki - * @version $Id$ * * This class should provide methods for message * cache key hints for various scopes */ diff --git a/includes/ObjectCache.php b/includes/ObjectCache.php index 7689b9442b..b476447adf 100644 --- a/includes/ObjectCache.php +++ b/includes/ObjectCache.php @@ -1,5 +1,4 @@ # http://www.mediawiki.org/ diff --git a/includes/OutputPage.php b/includes/OutputPage.php index 565d3e816d..31eb28d1e7 100644 --- a/includes/OutputPage.php +++ b/includes/OutputPage.php @@ -1,6 +1,5 @@ "Media", NS_SPECIAL => "Special", diff --git a/languages/LanguageUtf8.php b/languages/LanguageUtf8.php index aa7ec68d51..681940e80f 100644 --- a/languages/LanguageUtf8.php +++ b/languages/LanguageUtf8.php @@ -1,5 +1,5 @@ -* @version $Id$ * @access public */ class nusoap_base { var $title = 'NuSOAP'; var $version = '0.6.7'; - var $revision = '$Revision$'; + var $revision = '1.1'; var $error_str = false; var $debug_str = ''; // toggles automatic encoding of special characters as entities @@ -663,7 +661,6 @@ function usleepWindows($usec) * mainly used for returning faults from deployed functions * in a server instance. * @author Dietrich Ayala -* @version $Id$ * @access public */ class soap_fault extends nusoap_base { @@ -728,7 +725,6 @@ class soap_fault extends nusoap_base { * tutorials I refer to :) * * @author Dietrich Ayala -* @version $Id$ * @access public */ class XMLSchema extends nusoap_base { @@ -1489,7 +1485,6 @@ class XMLSchema extends nusoap_base { * NOTE: this is only really used when WSDL is not available. * * @author Dietrich Ayala -* @version $Id$ * @access public */ class soapval extends nusoap_base { @@ -1546,7 +1541,6 @@ class soapval extends nusoap_base { * NOTE: PHP must be compiled with the CURL extension for HTTPS support * * @author Dietrich Ayala -* @version $Id$ * @access public */ class soap_transport_http extends nusoap_base { @@ -2308,7 +2302,6 @@ class soap_transport_http extends nusoap_base { * NOTE: WSDL functionality is experimental * * @author Dietrich Ayala -* @version $Id$ * @access public */ class soap_server extends nusoap_base { @@ -3129,7 +3122,6 @@ class soap_server extends nusoap_base { * parses a WSDL file, allows access to it's data, other utility methods * * @author Dietrich Ayala -* @version $Id$ * @access public */ class wsdl extends nusoap_base { @@ -4428,7 +4420,6 @@ class wsdl extends nusoap_base { * soap_parser class parses SOAP XML messages into native PHP values * * @author Dietrich Ayala -* @version $Id$ * @access public */ class soap_parser extends nusoap_base { @@ -4966,7 +4957,6 @@ class soap_parser extends nusoap_base { * unset($soapclient); * * @author Dietrich Ayala -* @version $Id$ * @access public */ class soapclient extends nusoap_base { -- 2.20.1