[Phpwiki-talk] Re: [phpwiki-checkins] CVS: phpwiki index.php,1.97,1.98

[Reini U. <ru...@x-...>]

One note on this:
If someone commits a changed index.php,
he has to manually check it out on sf.net/demo and fix the cvs merges 
which break the whole wiki otherwise.

cd /home/groups/p/ph/phpwiki/htdocs/demo
cvs up
joe index.php

If he does nothing,
Steve's script updates it automatically,
the cvs merge breaks the wiki,
and anyone who likes to fix it has to deal a permission
problem for this file.
   index.php 644 wainstea.phpwiki

I did it by patching:

mv index.php index.php.broken
cvs up -f index.php
diff -bu index.php index.php.broken > index.patch
less index.patch
patch -p0 < index.patch


Lawrence Akka schrieb:
> Update of /cvsroot/phpwiki/phpwiki
> In directory usw-pr-cvs1:/tmp/cvs-serv22719
> 
> Modified Files:
> 	index.php 
> Log Message:
> Added RSS Auto-discover - see comments for details
> 
> Index: index.php
> ===================================================================
> RCS file: /cvsroot/phpwiki/phpwiki/index.php,v
> retrieving revision 1.97
> retrieving revision 1.98
> diff -u -2 -b -p -d -r1.97 -r1.98
> --- index.php	18 Sep 2002 18:34:13 -0000	1.97
> +++ index.php	12 Oct 2002 19:11:42 -0000	1.98
> @@ -625,4 +625,18 @@ define('INTERWIKI_MAP_FILE', "lib/interw
>  //if (!defined('VIRTUAL_PATH')) define('VIRTUAL_PATH', '/SomeWiki');
>  
> +/////////////////////////////////////////////////////////////////////
> +//
> +// Part Seven:
> +// Miscellaneous settings
> +//
> +/////////////////////////////////////////////////////////////////////
> +
> +/*
> + * Page name of RecentChanges page.  Used for RSS Auto-discovery
> + */
> + 
> +if (!defined('RECENT_CHANGES')) define ('RECENT_CHANGES', 'RecentChanges');
> +
> +
-- 
Reini Urban
http://xarch.tu-graz.ac.at/home/rurban/