Newsgroups: php.internals Path: news.php.net Xref: news.php.net php.internals:38281 Return-Path: Mailing-List: contact internals-help@lists.php.net; run by ezmlm Delivered-To: mailing list internals@lists.php.net Received: (qmail 38913 invoked from network); 16 Jun 2008 12:37:13 -0000 Received: from unknown (HELO lists.php.net) (127.0.0.1) by localhost with SMTP; 16 Jun 2008 12:37:13 -0000 Authentication-Results: pb1.pair.com header.from=helly@php.net; sender-id=unknown Authentication-Results: pb1.pair.com smtp.mail=helly@php.net; spf=unknown; sender-id=unknown Received-SPF: unknown (pb1.pair.com: domain php.net does not designate 85.214.94.56 as permitted sender) X-PHP-List-Original-Sender: helly@php.net X-Host-Fingerprint: 85.214.94.56 aixcept.net Linux 2.6 Received: from [85.214.94.56] ([85.214.94.56:51875] helo=h1149922.serverkompetenz.net) by pb1.pair.com (ecelerity 2.1.1.9-wez r(12769M)) with ESMTP id B5/76-06776-77E56584 for ; Mon, 16 Jun 2008 08:37:12 -0400 Received: from MBOERGER-ZRH (unknown [193.142.125.1]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by h1149922.serverkompetenz.net (Postfix) with ESMTP id E2A3611F113; Mon, 16 Jun 2008 14:37:07 +0200 (CEST) Date: Mon, 16 Jun 2008 14:37:03 +0200 Reply-To: Marcus Boerger X-Priority: 3 (Normal) Message-ID: <1381329685.20080616143703@marcus-boerger.de> To: Sebastian Bergmann CC: internals@lists.php.net In-Reply-To: References: MIME-Version: 1.0 Content-Type: text/plain; charset=iso-8859-15 Content-Transfer-Encoding: 8bit Subject: Re: [PHP-DEV] ext/phar/phar.phar From: helly@php.net (Marcus Boerger) 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