Newsgroups: php.internals Path: news.php.net Xref: news.php.net php.internals:38270 Return-Path: Mailing-List: contact internals-help@lists.php.net; run by ezmlm Delivered-To: mailing list internals@lists.php.net Received: (qmail 84329 invoked from network); 16 Jun 2008 08:56:59 -0000 Received: from unknown (HELO lists.php.net) (127.0.0.1) by localhost with SMTP; 16 Jun 2008 08:56:59 -0000 Authentication-Results: pb1.pair.com smtp.mail=php-php-dev@m.gmane.org; spf=pass; sender-id=pass Authentication-Results: pb1.pair.com header.from=news@ger.gmane.org; sender-id=pass Received-SPF: pass (pb1.pair.com: domain m.gmane.org designates 80.91.229.2 as permitted sender) X-PHP-List-Original-Sender: php-php-dev@m.gmane.org X-Host-Fingerprint: 80.91.229.2 main.gmane.org Linux 2.5 (sometimes 2.4) (4) Received: from [80.91.229.2] ([80.91.229.2:58968] helo=ciao.gmane.org) by pb1.pair.com (ecelerity 2.1.1.9-wez r(12769M)) with ESMTP id 1E/DC-06776-9DA26584 for ; Mon, 16 Jun 2008 04:56:58 -0400 Received: from list by ciao.gmane.org with local (Exim 4.43) id 1K8AWE-0001Vf-PX for internals@lists.php.net; Mon, 16 Jun 2008 08:56:54 +0000 Received: from p5088c459.dip.t-dialin.net ([80.136.196.89]) by main.gmane.org with esmtp (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Mon, 16 Jun 2008 08:56:54 +0000 Received: from sb by p5088c459.dip.t-dialin.net with local (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Mon, 16 Jun 2008 08:56:54 +0000 X-Injected-Via-Gmane: http://gmane.org/ To: internals@lists.php.net Date: Mon, 16 Jun 2008 10:56:44 +0200 Lines: 15 Message-ID: Mime-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-15; format=flowed Content-Transfer-Encoding: 7bit X-Gmane-NNTP-Posting-Host: p5088c459.dip.t-dialin.net User-Agent: Thunderbird 2.0.0.14 (Windows/20080421) Sender: news Subject: ext/phar/phar.phar From: sb@sebastian-bergmann.de (Sebastian Bergmann) 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