Re: [svn:parrot] r30640 - in trunk: . config/init docs lib/Parrot lib/Parrot/Configure lib/Parrot/Configure/Options lib/Parrot/Configure/Options/Conf t/configure t/postconfigure t/steps

[Nicholas Clark]

On Fri, Aug 29, 2008 at 04:09:29PM -0700, jkeenan@xxxxxxxxxxxx wrote:
> Author: jkeenan
> Date: Fri Aug 29 16:09:28 2008
> New Revision: 30640

> Log:
> Merge newsc branch into trunk, implementing Configuration-File interface to
> Configure.pl.  Applying patch submitted in
> http://rt.perl.org/rt3/Ticket/Display.html?id=44315.

Did you mean to check this in?

> +#<<<<<<< .working
>      elsif ( defined ( $fatal_step_str ) ) {
>          %steps_to_die_for = _handle_fatal_step_option( $fatal_step_str );
> +#=======
> +#    elsif ( defined ( $fatal_step ) ) {
> +#        %steps_to_die_for = $conf->_handle_fatal_step_option( $fatal_step );
> +#>>>>>>> .merge-right.r30499


Nicholas Clark