Hello Sebastian, now that phar.phar is integrated more with the build we could eventually drop it from CVS and always generate it. At the end of the day, the best cause of action is to disallow phar being disabled. Then we could even easily add tests for phar.phar.
marcus Monday, June 16, 2008, 10:56:44 AM, you wrote: > ext/phar/phar.phar seems to be modified during "make" as it always > conflicts here on "cvs up": > P ext/phar/phar.c > cvs update: nonmergeable file needs merge > cvs update: revision 1.7.2.19 from repository is now in > ext/phar/phar.phar > cvs update: file from working directory is now in .#phar.phar.1.7.2.14 > C ext/phar/phar.phar > Can someone please look into this? Thanks! > -- > Sebastian Bergmann http://sebastian-bergmann.de/ > GnuPG Key: 0xB85B5D69 / 27A7 2B14 09E4 98CD 6277 0E5B 6867 C514 B85B 5D69 Best regards, Marcus -- PHP Internals - PHP Runtime Development Mailing List To unsubscribe, visit: http://www.php.net/unsub.php
