Re: ext/phar/phar.phar
| From: | Pierre Joye | Date: | Mon, 16 Jun 2008 09:46:03 +0000 |
| Subject: | Re: ext/phar/phar.phar | ||
| References: | 1 | Groups: | php.internals |
| Request: | Send a blank email to internals+get-38272@lists.php.net to get a copy of this message | ||
On Mon, Jun 16, 2008 at 10:56 AM, Sebastian Bergmann
<sb@sebastian-bergmann.de> 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