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

[Lawrence A. <la...@20...>]

Reini,

I  realised  this  too  late.  I logged into sf, and tried to edit the
file,  but  I  couldn't  because  Steve  had  not given it group write
privileges. I sent him an email yesterday asking him to chmod it.

Thanks for fixing it! I didn't think of your solution.

Lawrence

-- 
Regards,


Lawrence                            

mailto:la...@20...

On Tuesday, October 15, 2002 at 9:27:15 AM, you wrote:

> 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');
>> +
>> +


==========NOTICE==========

Internet e-mail is not necessarily secure or reliable.  Please let us know if you would like to establish a secure channel of communication.

This e-mail and any attachments are confidential and may be legally privileged. They are intended only for the use of the named recipient. If you are not the named or intended recipient, please notify us immediately. In such an event, you should not disclose the contents of this e-mail or any attachments to any other person, nor copy, print, store or use them in any manner whatsoever. Thank you for your co-operation.

Although we have taken precautions to minimize the risk of transmitting software viruses, you are advised to carry out your own virus checks on any attachments to this message.

Tel: +44 (0)207 842 1200
http://www.20essexst.com
pos...@20...