Newsgroups: php.internals Path: news.php.net Xref: news.php.net php.internals:38272 Return-Path: Mailing-List: contact internals-help@lists.php.net; run by ezmlm Delivered-To: mailing list internals@lists.php.net Received: (qmail 2690 invoked from network); 16 Jun 2008 09:46:07 -0000 Received: from unknown (HELO lists.php.net) (127.0.0.1) by localhost with SMTP; 16 Jun 2008 09:46:07 -0000 Authentication-Results: pb1.pair.com header.from=pierre.php@gmail.com; sender-id=pass; domainkeys=bad Authentication-Results: pb1.pair.com smtp.mail=pierre.php@gmail.com; spf=pass; sender-id=pass Received-SPF: pass (pb1.pair.com: domain gmail.com designates 66.249.92.173 as permitted sender) DomainKey-Status: bad X-DomainKeys: Ecelerity dk_validate implementing draft-delany-domainkeys-base-01 X-PHP-List-Original-Sender: pierre.php@gmail.com X-Host-Fingerprint: 66.249.92.173 ug-out-1314.google.com Received: from [66.249.92.173] ([66.249.92.173:50584] helo=ug-out-1314.google.com) by pb1.pair.com (ecelerity 2.1.1.9-wez r(12769M)) with ESMTP id D1/70-06776-E5636584 for ; Mon, 16 Jun 2008 05:46:07 -0400 Received: by ug-out-1314.google.com with SMTP id h3so346727ugf.29 for ; Mon, 16 Jun 2008 02:46:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:message-id:date:from:to :subject:cc:in-reply-to:mime-version:content-type :content-transfer-encoding:content-disposition:references; bh=Vj36C/Qb+I+zyCibfxYbkfo4VtuoWWZlZJiHkA1tp7g=; b=h7Q/izEnMRoIrP7KAk/0jL3csA414wigPx6p3UD1kcuG8Jhm+2f60QQ4enP/xFVy41 m0GWPilczJU6a6dIilpj4wBnZh86KVrTq0x+Y9KA7Gf/njO3+Op8YOlAqfVGUXFNm1nE 4AcM0ORdB8KhnGpQ4Ut6vYZY6m/3Xdgjuywdo= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=message-id:date:from:to:subject:cc:in-reply-to:mime-version :content-type:content-transfer-encoding:content-disposition :references; b=GEK0G1lDmCO5AmmhynEBKjCKYSEpvRv8Xqn5W6e4j8bCtjrlImonM6gdPrwFquqiOm Y8U37poByYvKQIqDES/V8ip+2pbh4Z1bQoxLGOIEesQza909JMl6/BTpjiSEGZtJMpVU LuuoTxXr8TMgwcUpNWN3RFVP5b+OWboNoprz4= Received: by 10.66.220.17 with SMTP id s17mr5568346ugg.37.1213609563573; Mon, 16 Jun 2008 02:46:03 -0700 (PDT) Received: by 10.66.245.3 with HTTP; Mon, 16 Jun 2008 02:46:03 -0700 (PDT) Message-ID: Date: Mon, 16 Jun 2008 11:46:03 +0200 To: "Sebastian Bergmann" Cc: internals@lists.php.net In-Reply-To: MIME-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit Content-Disposition: inline References: Subject: Re: [PHP-DEV] ext/phar/phar.phar From: pierre.php@gmail.com ("Pierre Joye") On Mon, Jun 16, 2008 at 10:56 AM, Sebastian Bergmann 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! If that's the case, it would be nice to have phar.phar.in-like and generate one in the build directory. -- Pierre http://blog.thepimp.net | http://www.libgd.org