You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@perl.apache.org by Torsten Foertsch <to...@gmx.net> on 2008/06/28 12:08:10 UTC
Question about branching
Hi,
this is an excerpt of our BRANCHING document:
> #######################################
> ### make a new branch ###
> #######################################
>
> we will create a branch mybranch
>
> branch:
>
> svn copy https://svn.apache.org/repos/asf/perl/modperl/trunk \
> https://svn.apache.org/repos/asf/perl/modperl/branches/mybranch \
> -m "creating mybranch"
>
> check out:
>
> svn co https://svn.apache.org/repos/asf/perl/modperl/branches/mybranch
>
> change externals to point to the new A-T branch (if one was done)
>
> svn propedit svn:externals .
The threading branch doesn't have a new A-T or docs. Hence, A-T and docs point
to the current trunk. I don't want to commit something by chance to these
trees. Can I have SVN automatically forbid such changes?
> initialize svnmerge tracking in the branch (if you plan to pull trunk/
> changes into the branch)
Is this thought to be one big commit? Or should it rather be a set of smaller
changes?
> mybranch/ $> svnmerge init
When am I supposed to do this before I begin to integrate trunk changes or
after all changes are committed to my branch?
> property 'svnmerge-integrated' set on '.'
> mybranch/ $> svn ci -F svnmerge-commit-message.txt
Is this done as a separate commit or is it the one big commit or the last one?
Sorry for being so stupid,
Torsten
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@perl.apache.org
For additional commands, e-mail: dev-help@perl.apache.org
Re: Question about branching
Posted by "Philippe M. Chiasson" <go...@ectoplasm.org>.
Torsten Foertsch wrote:
> On Sat 28 Jun 2008, Torsten Foertsch wrote:
>>> mybranch/ $> svnmerge init
>> When am I supposed to do this before I begin to integrate trunk changes or
>> after all changes are committed to my branch?
>>
>>> property 'svnmerge-integrated' set on '.'
>>> mybranch/ $> svn ci -F svnmerge-commit-message.txt
>> Is this done as a separate commit or is it the one big commit or the last
>> one?
>
> Replying to myself, I followed the link to the svnmerge wiki and
> followed the instructions there. Now, the threading branch is up
> to date with trunk and works with perl 5.10.
>
> However, with the worker MPM I get a core dump at the end of the
> test suite although all tests pass successfully. I have read in
> todo/2.0.5 about a segfault on windows. Maybe they are related.
> Here is a stack trace:
>
> #0 0x00002af8d6e22e19 in Perl_sv_free () from /usr/lib/perl5/5.10.0/x86_64-linux-thread-multi/CORE/libperl.so
> #1 0x00002af8d6e25c5c in ?? () from /usr/lib/perl5/5.10.0/x86_64-linux-thread-multi/CORE/libperl.so
> #2 0x00002af8d6e20222 in Perl_sv_setsv_flags () from /usr/lib/perl5/5.10.0/x86_64-linux-thread-multi/CORE/libperl.so
> #3 0x00002af8d6e12157 in Perl_pp_aassign () from /usr/lib/perl5/5.10.0/x86_64-linux-thread-multi/CORE/libperl.so
> #4 0x00002af8d6de0b07 in Perl_runops_debug () from /usr/lib/perl5/5.10.0/x86_64-linux-thread-multi/CORE/libperl.so
> #5 0x00002af8d6e06800 in Perl_call_sv () from /usr/lib/perl5/5.10.0/x86_64-linux-thread-multi/CORE/libperl.so
> #6 0x00002af8d6b0bfdc in modperl_callback (my_perl=0x2e9fe60, handler=0xace840, p=0x455b398, r=0x455b418, s=0x683860, args=0x66097d0) at modperl_callback.c:100
> #7 0x00002af8d6b0ccfe in modperl_callback_run_handlers (idx=6, type=4, r=0x455b418, c=<value optimized out>, s=0x683860, pconf=<value optimized out>, plog=0x0, ptemp=0x0, run_mode=MP_HOOK_RUN_FIRST)
> at modperl_callback.c:255
> #8 0x00002af8d6b0d77f in modperl_callback_per_dir (idx=48889440, r=0x48e8868, run_mode=<value optimized out>) at modperl_callback.c:367
> #9 0x00002af8d6b03040 in modperl_response_handler_run (r=0x455b418, finish=1) at mod_perl.c:1017
> #10 0x00002af8d6b034b6 in modperl_response_handler (r=0x455b418) at mod_perl.c:1059
> #11 0x000000000043b7b3 in ap_run_handler (r=0x455b418) at config.c:158
> #12 0x000000000043ecff in ap_invoke_handler (r=0x455b418) at config.c:372
> #13 0x0000000000449ace in ap_process_request (r=0x455b418) at http_request.c:258
> #14 0x0000000000446b78 in ap_process_http_connection (c=0x4555610) at http_core.c:190
> #15 0x0000000000442c23 in ap_run_process_connection (c=0x4555610) at connection.c:43
> #16 0x000000000044f001 in worker_thread (thd=0x2d6e760, dummy=<value optimized out>) at worker.c:544
> #17 0x00002af8cc547040 in start_thread () from /lib64/libpthread.so.0
> #18 0x00002af8cca340cd in clone () from /lib64/libc.so.6
Any chance you can reproduce with a debug perl build so we can see what perl is trying to free ?
Also, in #6, it would be nice to see the content of handler, r, s and args to get an idea of what
was being executed in mp land.
--
Philippe M. Chiasson GPG: F9BFE0C2480E7680 1AE53631CB32A107 88C3A5A5
http://gozer.ectoplasm.org/ m/gozer\@(apache|cpan|ectoplasm)\.org/
Re: Question about branching
Posted by Torsten Foertsch <to...@gmx.net>.
On Sat 28 Jun 2008, Torsten Foertsch wrote:
> > mybranch/ $> svnmerge init
>
> When am I supposed to do this before I begin to integrate trunk changes or
> after all changes are committed to my branch?
>
> > property 'svnmerge-integrated' set on '.'
> > mybranch/ $> svn ci -F svnmerge-commit-message.txt
>
> Is this done as a separate commit or is it the one big commit or the last
> one?
Replying to myself, I followed the link to the svnmerge wiki and
followed the instructions there. Now, the threading branch is up
to date with trunk and works with perl 5.10.
However, with the worker MPM I get a core dump at the end of the
test suite although all tests pass successfully. I have read in
todo/2.0.5 about a segfault on windows. Maybe they are related.
Here is a stack trace:
#0 0x00002af8d6e22e19 in Perl_sv_free () from /usr/lib/perl5/5.10.0/x86_64-linux-thread-multi/CORE/libperl.so
#1 0x00002af8d6e25c5c in ?? () from /usr/lib/perl5/5.10.0/x86_64-linux-thread-multi/CORE/libperl.so
#2 0x00002af8d6e20222 in Perl_sv_setsv_flags () from /usr/lib/perl5/5.10.0/x86_64-linux-thread-multi/CORE/libperl.so
#3 0x00002af8d6e12157 in Perl_pp_aassign () from /usr/lib/perl5/5.10.0/x86_64-linux-thread-multi/CORE/libperl.so
#4 0x00002af8d6de0b07 in Perl_runops_debug () from /usr/lib/perl5/5.10.0/x86_64-linux-thread-multi/CORE/libperl.so
#5 0x00002af8d6e06800 in Perl_call_sv () from /usr/lib/perl5/5.10.0/x86_64-linux-thread-multi/CORE/libperl.so
#6 0x00002af8d6b0bfdc in modperl_callback (my_perl=0x2e9fe60, handler=0xace840, p=0x455b398, r=0x455b418, s=0x683860, args=0x66097d0) at modperl_callback.c:100
#7 0x00002af8d6b0ccfe in modperl_callback_run_handlers (idx=6, type=4, r=0x455b418, c=<value optimized out>, s=0x683860, pconf=<value optimized out>, plog=0x0, ptemp=0x0, run_mode=MP_HOOK_RUN_FIRST)
at modperl_callback.c:255
#8 0x00002af8d6b0d77f in modperl_callback_per_dir (idx=48889440, r=0x48e8868, run_mode=<value optimized out>) at modperl_callback.c:367
#9 0x00002af8d6b03040 in modperl_response_handler_run (r=0x455b418, finish=1) at mod_perl.c:1017
#10 0x00002af8d6b034b6 in modperl_response_handler (r=0x455b418) at mod_perl.c:1059
#11 0x000000000043b7b3 in ap_run_handler (r=0x455b418) at config.c:158
#12 0x000000000043ecff in ap_invoke_handler (r=0x455b418) at config.c:372
#13 0x0000000000449ace in ap_process_request (r=0x455b418) at http_request.c:258
#14 0x0000000000446b78 in ap_process_http_connection (c=0x4555610) at http_core.c:190
#15 0x0000000000442c23 in ap_run_process_connection (c=0x4555610) at connection.c:43
#16 0x000000000044f001 in worker_thread (thd=0x2d6e760, dummy=<value optimized out>) at worker.c:544
#17 0x00002af8cc547040 in start_thread () from /lib64/libpthread.so.0
#18 0x00002af8cca340cd in clone () from /lib64/libc.so.6
Torsten
--
Need professional mod_perl support?
Just hire me: torsten.foertsch@gmx.net
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@perl.apache.org
For additional commands, e-mail: dev-help@perl.apache.org