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
On Mon, Jun 16, 2008 at 10:56 AM, Sebastian Bergmann
<[EMAIL PROTECTED]> 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 repositor
If that's the case, it would be nice to have phar.phar.in-like and
generate one in the build directory.
Except that the 50 or so other phars in CVS don't have this problem... will
look into it later.
Thanks,
- Steph
--
PHP Internals - PHP Runtime Development Mailing List
To unsubscribe,
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,
