Front page | perl.perl5.porters |
Postings from June 2013
Re: [perl.git] branch blead, updated. v5.19.0-414-g77f118c
Thread Next
From:
H.Merijn Brand
Date:
June 6, 2013 14:37
Subject:
Re: [perl.git] branch blead, updated. v5.19.0-414-g77f118c
Message ID:
20130606163721.73e267cc@pc09.procura.nl
On Thu, 06 Jun 2013 16:18:53 +0200, "H.Merijn Brand"
<h.m.brand@xs4all.nl> wrote:
> In perl.git, the branch blead has been updated
>
> <http://perl5.git.perl.org/perl.git/commitdiff/77f118c279be3f2b4aaa364f584602f96d70b97c?hp=4f2e2aa236a3300a5f46fd5b3f02db9cf158f62f>
TonyC said I did something wrong.
What I did was trying to follow to the letter what was written in
pod/perlgit.pod "Using a smoke-me branch to test changes"
git pull --all
git remote prune origin
git rebase blead remotes/origin/smoke-me/env-instead-of-echo
git checkout blead
git merge remotes/origin/smoke-me/env-instead-of-echo --no-ff --no-commit
… Configure / Make / Test …
git pull --all
git remote prune origin
git commit
git push
git push origin :smoke-me/env-instead-of-echo
With this single commit, I could also have cherry-picked it. I just
wanted to test what the docs told me to do. If that is not what I
should have done, the docs should be amended.
FIY I used remotes/origin/smoke-me/env-instead-of-echo instead of a
local branch, as I fucked up in an earlier stage and had to reclone
> - Log -----------------------------------------------------------------
> commit 77f118c279be3f2b4aaa364f584602f96d70b97c
> Merge: 4f2e2aa 60acf81
> Author: H.Merijn Brand <h.m.brand@xs4all.nl>
> Date: Thu Jun 6 16:18:44 2013 +0200
>
> Merge remote-tracking branch 'remotes/origin/smoke-me/env-instead-of-echo' into blead
> -----------------------------------------------------------------------
>
> Summary of changes:
> t/op/magic.t | 17 +++++++++--------
> 1 files changed, 9 insertions(+), 8 deletions(-)
>
> diff --git a/t/op/magic.t b/t/op/magic.t
> index b7ce3ae..ac66b60 100644
> --- a/t/op/magic.t
> +++ b/t/op/magic.t
> @@ -56,11 +56,11 @@ $Is_Dos = $^O eq 'dos';
> $Is_os2 = $^O eq 'os2';
> $Is_Cygwin = $^O eq 'cygwin';
>
> -$PERL = $ENV{PERL}
> - || ($Is_NetWare ? 'perl' :
> - $Is_VMS ? $^X :
> - $Is_MSWin32 ? '.\perl' :
> - './perl');
> +$PERL = $ENV{PERL} ||
> + ($Is_NetWare ? 'perl' :
> + $Is_VMS ? $^X :
> + $Is_MSWin32 ? '.\perl' :
> + './perl');
>
> sub env_is {
> my ($key, $val, $desc) = @_;
> @@ -82,7 +82,8 @@ sub env_is {
> $eqv = "\n" if length($eqv) == 2 and $eqv eq "\000\n";
> is $eqv, "$val\n", $desc;
> } else {
> - is `echo \$\Q$key\E`, "$val\n", $desc;
> + chomp (my @env = grep { s/^$key=// } `env`);
> + is "@env", $val, $desc;
> }
> }
>
> @@ -625,10 +626,10 @@ is ${^LAST_FH}, undef, '${^LAST_FH} is undef when PL_last_in_gv is NULL';
>
>
> # $|
> -fresh_perl_is 'print $| = ~$|', "1\n", {switches => ['-l']},
> +fresh_perl_is 'print $| = ~$|', "1\n", {switches => ['-l']},
> '[perl #4760] print $| = ~$|';
> fresh_perl_is
> - 'select f; undef *f; ${q/|/}; print STDOUT qq|ok\n|', "ok\n", {},
> + 'select f; undef *f; ${q/|/}; print STDOUT qq|ok\n|', "ok\n", {},
> '[perl #115206] no crash when vivifying $| while *{+select}{IO} is undef';
--
H.Merijn Brand http://tux.nl Perl Monger http://amsterdam.pm.org/
using perl5.00307 .. 5.19 porting perl5 on HP-UX, AIX, and openSUSE
http://mirrors.develooper.com/hpux/ http://www.test-smoke.org/
http://qa.perl.org http://www.goldmark.org/jeff/stupid-disclaimers/
Thread Next
-
Re: [perl.git] branch blead, updated. v5.19.0-414-g77f118c
by H.Merijn Brand