On 7/17/07, [EMAIL PROTECTED] <[EMAIL PROTECTED]> wrote:
Hi Jerry,

I never know exactly how to handle this - making the latest release:

- t/configure/106-init_headers.t
- t/configure/base.t
- t/configure/config_steps.t
Use of bare << to mean <<"" is deprecated at config/init/hints/linux.pm
line 57.
Use of bare << to mean <<"" is deprecated at config/init/hints/linux.pm
line 69.
Use of bare << to mean <<"" is deprecated at config/init/hints/linux.pm
line 98.
Use of bare << to mean <<"" is deprecated at config/init/hints/linux.pm
line 103.
Number found where operator expected at config/init/hints/linux.pm line
110, near "mine
1"
   (Missing semicolon on previous line?)


Appears there's some cruft in there:
ls -l config/init/hints/linux.pm*
-rw-r--r--  1 root root 3381 Jul 17 20:07 config/init/hints/linux.pm
-rw-r--r--  1 root root 3034 Jun  6 10:14 config/init/hints/linux.pm.mine
-rw-r--r--  1 root root 3029 Jun  6 10:14
config/init/hints/linux.pm.r18722
-rw-r--r--  1 root root 2872 Jun  6 10:14
config/init/hints/linux.pm.r18840
-rw-r--r--  1 root root 3375 Jul 13 09:43 config/init/hints/linux.pm~

and the current linux.pm has some '<<<<<<' of a diff in it.

it looks to me like you've got a conflict in your svn working copy.
some local code you have couldn't be merged with your latest working
copy update. 'svn st' will let you know by giving you something like:

 C        config/init/hints/linux.pm

if you've got a conflict, you'll either have to do a manual merge, or
revert it. you can find procedures for that in the svn help.

i browsed the release on cpan just to be sure, and i can't see any
cruft in config/init/hints/linux.pm (or in t/configure/config_steps.t
for that matter.)

let me know if that doesn't fix it.
~jerry

Reply via email to