You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@perl.apache.org by Stas Bekman <st...@stason.org> on 2005/05/04 08:56:56 UTC
broken svn? tagging commits things to the trunk?
Something is broken here. Why making tag commits changes that weren't
intended to be committed to the trunk? The tagging was done via make which
does:
svn copy . https://svn.apache.org/repos/asf/perl/modperl/tags/$(VERSION_SYM)
:(
stas@apache.org wrote:
> Author: stas
> Date: Tue May 3 19:45:13 2005
> New Revision: 168056
>
> URL: http://svn.apache.org/viewcvs?rev=168056&view=rev
> Log:
> RC6
>
> Added:
> perl/modperl/tags/2_0_0_RC6/
> - copied from r168044, perl/modperl/trunk/
> perl/modperl/tags/2_0_0_RC6/Changes
> - copied unchanged from r168055, perl/modperl/trunk/Changes
> perl/modperl/tags/2_0_0_RC6/Makefile.PL
> - copied unchanged from r168055, perl/modperl/trunk/Makefile.PL
> perl/modperl/tags/2_0_0_RC6/README
> - copied unchanged from r168049, perl/modperl/trunk/README
> perl/modperl/tags/2_0_0_RC6/RELEASE
> - copied unchanged from r168054, perl/modperl/trunk/RELEASE
> Modified:
> perl/modperl/tags/2_0_0_RC6/build/make_etags
> perl/modperl/tags/2_0_0_RC6/t/conf/extra.conf.in
>
> Modified: perl/modperl/tags/2_0_0_RC6/build/make_etags
> URL: http://svn.apache.org/viewcvs/perl/modperl/tags/2_0_0_RC6/build/make_etags?rev=168056&r1=168044&r2=168056&view=diff
> ==============================================================================
> --- perl/modperl/tags/2_0_0_RC6/build/make_etags (original)
> +++ perl/modperl/tags/2_0_0_RC6/build/make_etags Tue May 3 19:45:13 2005
> @@ -8,10 +8,10 @@
>
> #e.g. symlink to $HOME/perl/perl-current
> #XXX: perl has its own (more robust) TAGS generator: emacs/ptags
> -perl_src=$root/perl/
> +perl_src=$root/perl
> #XXX: apache has its own: build/MakeEtags
> -apache_src=$root/httpd-2.0/
> -modperl_src=$root/modperl-2.0/src/
> +apache_src=$root/httpd-2.0
> +modperl_src=$root/modperl-2.0/src
> xs_src=$root/modperl-2.0/xs
>
> cd $root/modperl-2.0
> @@ -24,4 +24,4 @@
>
> (cd src/modules/perl && etags `cat etag_files`)
>
> -rm -f src/modules/perl/etag_files
> +#rm -f src/modules/perl/etag_files
>
> Modified: perl/modperl/tags/2_0_0_RC6/t/conf/extra.conf.in
> URL: http://svn.apache.org/viewcvs/perl/modperl/tags/2_0_0_RC6/t/conf/extra.conf.in?rev=168056&r1=168044&r2=168056&view=diff
> ==============================================================================
> --- perl/modperl/tags/2_0_0_RC6/t/conf/extra.conf.in (original)
> +++ perl/modperl/tags/2_0_0_RC6/t/conf/extra.conf.in Tue May 3 19:45:13 2005
> @@ -73,15 +73,15 @@
> # </sandbox-friendly>
>
> <Location /status/perl>
> -# PerlSetVar StatusOptionsAll On
> -# PerlSetVar StatusDumper On
> -# PerlSetVar StatusPeek On
> -# PerlSetVar StatusLexInfo On
> -# PerlSetVar StatusDeparse On
> -# PerlSetVar StatusDeparseOptions "-p -sC"
> -# PerlSetVar StatusTerse On
> -# PerlSetVar StatusTerseSize On
> -# PerlSetVar StatusTerseSizeMainSummary On
> + PerlSetVar StatusOptionsAll On
> + PerlSetVar StatusDumper On
> + PerlSetVar StatusPeek On
> + PerlSetVar StatusLexInfo On
> + PerlSetVar StatusDeparse On
> + PerlSetVar StatusDeparseOptions "-p -sC"
> + PerlSetVar StatusTerse On
> + PerlSetVar StatusTerseSize On
> + PerlSetVar StatusTerseSizeMainSummary On
> SetHandler modperl
> PerlResponseHandler Apache2::Status
> </Location>
>
--
__________________________________________________________________
Stas Bekman JAm_pH ------> Just Another mod_perl Hacker
http://stason.org/ mod_perl Guide ---> http://perl.apache.org
mailto:stas@stason.org http://use.perl.org http://apacheweek.com
http://modperlbook.org http://apache.org http://ticketmaster.com
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@perl.apache.org
For additional commands, e-mail: dev-help@perl.apache.org
Re: broken svn? tagging commits things to the trunk?
Posted by Stas Bekman <st...@stason.org>.
Philippe M. Chiasson wrote:
> Stas Bekman wrote:
>
>>Stas Bekman wrote:
>>
>>[...]
>>I suppose we would like to change the tagging target in makefile from
>>the above to:
>>
>>svn copy http://svn.apache.org/viewcvs.cgi/perl/modperl/trunk
>>https://svn.apache.org/repos/asf/perl/modperl/tags/$(VERSION_SYM)
>>
>>so local changes don't affect the tag.
>
>
> Yes, the recommended way I'd tag things is always with 2 remote URLs
>
> svn copy \
> https://svn.apache.org/repos/asf/perl/modperl/trunk \
> https://svn.apache.org/repos/asf/perl/modperl/tags/$(VERSION_SYM)
>
> That way, you know that you are tagging something 100% consistent.
>
> Then, you'd have to svn export that tag and build your final tarball from
> it.
+++1, that way local changes won't end up in the tarball, which was
unfortunately the case with my release yesterday. Luckily they don't
affect anybody. Philippe, can you please adjust the procedures in both
RELEASE files? Thanks!
--
__________________________________________________________________
Stas Bekman JAm_pH ------> Just Another mod_perl Hacker
http://stason.org/ mod_perl Guide ---> http://perl.apache.org
mailto:stas@stason.org http://use.perl.org http://apacheweek.com
http://modperlbook.org http://apache.org http://ticketmaster.com
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@perl.apache.org
For additional commands, e-mail: dev-help@perl.apache.org
Re: broken svn? tagging commits things to the trunk?
Posted by "Philippe M. Chiasson" <go...@ectoplasm.org>.
Stas Bekman wrote:
> Stas Bekman wrote:
>
> [...]
> I suppose we would like to change the tagging target in makefile from
> the above to:
>
> svn copy http://svn.apache.org/viewcvs.cgi/perl/modperl/trunk
> https://svn.apache.org/repos/asf/perl/modperl/tags/$(VERSION_SYM)
>
> so local changes don't affect the tag.
Yes, the recommended way I'd tag things is always with 2 remote URLs
svn copy \
https://svn.apache.org/repos/asf/perl/modperl/trunk \
https://svn.apache.org/repos/asf/perl/modperl/tags/$(VERSION_SYM)
That way, you know that you are tagging something 100% consistent.
Then, you'd have to svn export that tag and build your final tarball from
it.
--------------------------------------------------------------------------------
Philippe M. Chiasson m/gozer\@(apache|cpan|ectoplasm)\.org/ GPG KeyID : 88C3A5A5
http://gozer.ectoplasm.org/ F9BF E0C2 480E 7680 1AE5 3631 CB32 A107 88C3A5A5
Re: broken svn? tagging commits things to the trunk?
Posted by Stas Bekman <st...@stason.org>.
Stas Bekman wrote:
> Something is broken here. Why making tag commits changes that weren't
> intended to be committed to the trunk? The tagging was done via make
> which does:
>
> svn copy .
> https://svn.apache.org/repos/asf/perl/modperl/tags/$(VERSION_SYM)
>
> :(
Actually, I was wrong: it has committed it to the tagg'ed branch, the
trunk is fine.
I suppose we would like to change the tagging target in makefile from the
above to:
svn copy http://svn.apache.org/viewcvs.cgi/perl/modperl/trunk
https://svn.apache.org/repos/asf/perl/modperl/tags/$(VERSION_SYM)
so local changes don't affect the tag.
--
__________________________________________________________________
Stas Bekman JAm_pH ------> Just Another mod_perl Hacker
http://stason.org/ mod_perl Guide ---> http://perl.apache.org
mailto:stas@stason.org http://use.perl.org http://apacheweek.com
http://modperlbook.org http://apache.org http://ticketmaster.com
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@perl.apache.org
For additional commands, e-mail: dev-help@perl.apache.org