From: Joby W. <joby@u.washington.edu> - 2002-10-16 16:56:55
|
I was in the process of commiting a minor update to index2.php (correct=20 alphabetization), but my linux box lost power, so the commit did not=20 complete. Now, my old commit process still has a lock on the file -- how=20 do I undo the lock? jbw Joseph Walker wrote: > Update of /cvsroot/phpwiki/phpwiki > In directory usw-pr-cvs1:/tmp/cvs-serv26097 >=20 > Added Files: > index2.php=20 > Log Message: > Initial split of index.php into three files: index.php (index2.php here= to prevent breakage) config/config-dist.php config/config-user.php. Not= e: this will break configurator.php. >=20 > --- NEW FILE: index2.php --- > <?php // -*-php-*- >=20 > /* > Copyright 1999, 2000, 2001, 2002 $ThePhpWikiProgrammingTeam =3D array( > "Steve Wainstead", "Clifford A. Adams", "Lawrence Akka",=20 > "Scott R. Anderson", "Jon =C5slund", "Neil Brown", "Jeff Dairiki", > "St=E9phane Gourichon", "Jan Hidders", "Arno Hollosi", "John Jorgensen"= , > "Antti Kaihola", "Jeremie Kass", "Carsten Klapp", "Marco Milanesi", > "Grant Morgan", "Jan Nieuwenhuizen", "Aredridel Niothke",=20 > "Pablo Roca Rozas", "Sandino Araico S=E1nchez", "Joel Uckelman",=20 > "Joseph (Joby) Walker", "Reini Urban", "Tim Voght"); >=20 > This file is part of PhpWiki. >=20 > PhpWiki is free software; you can redistribute it and/or modify > it under the terms of the GNU General Public License as published by > the Free Software Foundation; either version 2 of the License, or > (at your option) any later version. >=20 > PhpWiki is distributed in the hope that it will be useful, > but WITHOUT ANY WARRANTY; without even the implied warranty of > MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the > GNU General Public License for more details. >=20 > You should have received a copy of the GNU General Public License > along with PhpWiki; if not, write to the Free Software > Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 U= SA > */ >=20 > define ('DEBUG', 1); > ///////////////////////////////////////////////////////////////////// > // Part Null: Don't touch this! >=20 > define ('PHPWIKI_VERSION', '1.3.4pre'); > require "lib/prepend.php"; > rcs_id('$Id: index2.php,v 1.1 2002/10/16 16:37:05 zorloc Exp $'); >=20 > require "config/config-user.php"; > require "config/config-dist.php"; >=20 > // Tested: Works with CGI also. > if (defined('VIRTUAL_PATH') and defined('USE_PATH_INFO')) { > if ($HTTP_SERVER_VARS['SCRIPT_NAME'] =3D=3D VIRTUAL_PATH) { > include "lib/main.php"; > } > } else { > if (defined('SCRIPT_NAME') and=20 > ($HTTP_SERVER_VARS['SCRIPT_NAME'] =3D=3D SCRIPT_NAME)) { > include "lib/main.php"; > } elseif (strstr($HTTP_SERVER_VARS['PHP_SELF'],'index.php')) { > include "lib/main.php"; > } > } >=20 > // (c-file-style: "gnu") > // Local Variables: > // mode: php > // tab-width: 8 > // c-basic-offset: 4 > // c-hanging-comment-ender-p: nil > // indent-tabs-mode: nil > // End: =20 > ?> >=20 >=20 >=20 > ------------------------------------------------------- > This sf.net email is sponsored by: viaVerio will pay you up to > $1,000 for every account that you consolidate with us. > http://ad.doubleclick.net/clk;4749864;7604308;v? > http://www.viaverio.com/consolidator/osdn.cfm > _______________________________________________ > phpwiki-checkins mailing list > php...@li... > https://lists.sourceforge.net/lists/listinfo/phpwiki-checkins |