From: Reini U. <ru...@x-...> - 2005-01-18 20:42:07
|
Charles Corrigan schrieb: > I understand and agree with why config.ini is not in CVS. However it does > cause minor issues for me - when I request a refresh of phpwiki from cvs, > Eclipse wipes all changed files and other files not in CVS i.e. config.ini > > Anyway, rather than discussing my reasons to want this change - what about > the technical merits of the change itself? Why should we add another config var for the config.ini name? The only reason I see is not to confuse some broken, automated webpage updates, e.g. via rsync or ftp. But with this scenerio, which ignores CVS settings such as Eclipse obviously does, I would recommend another safe place for this config.ini in question. Somewhere else, so that it will not get overwritten. IniConfig("/etc/phpwiki.ini"); // as in debian e.g. Or better fix the wrong app. rsync understand exclude files and lists, with ftp it's more difficult, I didn't have a look at Eclipse CVS integration so far. Looks very broken to me, not to update, but to get fresh new entries all the time. Just to get rid of C - cvs conflicts - there are better methods than to delete all existing files. cvs up -C is the simpliest of all. We use a better method on phpwiki.sf.net to do not-conflicting cvs updates. rurban@sc8-pr-shell1:~/bin$ cat demoup #!/bin/sh cd ~/demo cvs -n up 2>&1 |grep "^C " | cut -c3- > ~/cvsup.lst for f in $(cat ~/cvsup.lst); do mv $f $f.tmp cvs up -C $f 2>&1 | tee -a cvsup.log done cvs up 2>&1 | tee -a cvsup.log You might want to discuss that with the eclipse folks. They will see the technical benefits. > -----Original Message----- > From: Reini Urban [mailto:ru...@x-...] > Sent: 18 January 2005 21:44 > To: php...@li... > Subject: Re: [Phpwiki-talk] RFC: allow "wiki" to specify location of > config.ini > > Charles Corrigan schrieb: >>I would like the wiki file to specify the location of config.ini. This >>would allow me to use the clean versions of PhpWiki from CVS without >>a) having to remember to copy config.ini into the CVS controlled directory >>each time I get a fresh version (Eclipse deletes my private version of >>config.ini when I request a refresh from CVS > > config/config.ini is NOT in CVS. On purpose! > >>b) when I get CVS-write access, I will not accidentally checkin my private >>version of config.ini with passwords > > So don't cvs add config/config.ini > You can safely commit, cvs will touch only files which are in the > CVS/Entries file. config/config.ini is not. -- Reini Urban http://xarch.tu-graz.ac.at/home/rurban/ |