You are viewing a plain text version of this content. The canonical link for it is here.
Posted to modperl-cvs@perl.apache.org by jo...@apache.org on 2005/03/04 16:28:12 UTC
svn commit: r156165 - perl/modperl/branches/apache2-rename-unstable/docs
Author: joes
Date: Fri Mar 4 07:28:11 2005
New Revision: 156165
URL: http://svn.apache.org/viewcvs?view=rev&rev=156165
Log:
Copy 2.0 docs directly to Apache2:: rename branch
Added:
perl/modperl/branches/apache2-rename-unstable/docs/
- copied from r156164, perl/modperl/docs/trunk/src/docs/2.0/
Re: svn commit: r156165 -
perl/modperl/branches/apache2-rename-unstable/docs
Posted by Joe Schaefer <jo...@sunstarsys.com>.
Geoffrey Young <ge...@modperlcookbook.org> writes:
>> That what I thought what be the right thing to do. But I have an even
>> better idea. The best approach is to avoid the merge of docs entirely.
>> So how about this plan. You complete the code branch w/o touching the
>> docs, and when you are ready to port the docs announce a freeze of
>> modperl-docs/src/docs/2.0 sub-tree, and go and port it, then merge the
>> branch with the trunk. This scenario requires no move of docs whatsoever
>> in the svn setup. so if like it you probably want to drop docs/ from
>> that branch for now.
>
> since this is pretty much what I was going to suggest +1 :)
Done.
--
Joe Schaefer
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@perl.apache.org
For additional commands, e-mail: dev-help@perl.apache.org
Re: svn commit: r156165 - perl/modperl/branches/apache2-rename-unstable/docs
Posted by Geoffrey Young <ge...@modperlcookbook.org>.
> That what I thought what be the right thing to do. But I have an even
> better idea. The best approach is to avoid the merge of docs entirely.
> So how about this plan. You complete the code branch w/o touching the
> docs, and when you are ready to port the docs announce a freeze of
> modperl-docs/src/docs/2.0 sub-tree, and go and port it, then merge the
> branch with the trunk. This scenario requires no move of docs whatsoever
> in the svn setup. so if like it you probably want to drop docs/ from
> that branch for now.
since this is pretty much what I was going to suggest +1 :)
--Geoff
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@perl.apache.org
For additional commands, e-mail: dev-help@perl.apache.org
Re: svn commit: r156165 - perl/modperl/branches/apache2-rename-unstable/docs
Posted by Stas Bekman <st...@stason.org>.
Joe Schaefer wrote:
>>>>hmm, why doing this in the new branch?
>>>
>>>Because trunk's layout is incorrect.
>>
>>You mean, you can't fix that?
>
>
> Yes, we certainly can by inverting the externals for trunk,
> but I'd rather not do that without giving people a few days
> to cope with the eventual change.
Eh? Why this should touch anybody, I've suggested to swap the source of
/docs, it has nothing to do with the apache2-unstable-rename branch, it
should be totally transparent.
> But depending on how the docs subproject operates, it might
> be easier to first map their 2.0 externals to the
> apache2-unstable-rename branch instead. I have no preference
> one way or the other.
>
> [...]
>
>
>>Just remember that merging docs is much harder and more
>>time consuming than code.
>
>
> Ok; I don't have any immediate plans to do any docs work on
> the branch, so if someone comes up with a better idea for
> making the switchover easy, let's do that soonish.
That what I thought what be the right thing to do. But I have an even
better idea. The best approach is to avoid the merge of docs entirely. So
how about this plan. You complete the code branch w/o touching the docs,
and when you are ready to port the docs announce a freeze of
modperl-docs/src/docs/2.0 sub-tree, and go and port it, then merge the
branch with the trunk. This scenario requires no move of docs whatsoever
in the svn setup. so if like it you probably want to drop docs/ from that
branch for now.
--
__________________________________________________________________
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: svn commit: r156165 -
perl/modperl/branches/apache2-rename-unstable/docs
Posted by Joe Schaefer <jo...@sunstarsys.com>.
Stas Bekman <st...@stason.org> writes:
> Joe Schaefer wrote:
>> Stas Bekman <st...@stason.org> writes:
>> [...]
>>
>>>hmm, why doing this in the new branch?
>> Because trunk's layout is incorrect.
>
> You mean, you can't fix that?
Yes, we certainly can by inverting the externals for trunk,
but I'd rather not do that without giving people a few days
to cope with the eventual change.
But depending on how the docs subproject operates, it might
be easier to first map their 2.0 externals to the
apache2-unstable-rename branch instead. I have no preference
one way or the other.
[...]
> Just remember that merging docs is much harder and more
> time consuming than code.
Ok; I don't have any immediate plans to do any docs work on
the branch, so if someone comes up with a better idea for
making the switchover easy, let's do that soonish.
--
Joe Schaefer
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@perl.apache.org
For additional commands, e-mail: dev-help@perl.apache.org
Re: svn commit: r156165 - perl/modperl/branches/apache2-rename-unstable/docs
Posted by Stas Bekman <st...@stason.org>.
Joe Schaefer wrote:
> Stas Bekman <st...@stason.org> writes:
>
> [...]
>
>
>>hmm, why doing this in the new branch?
>
>
> Because trunk's layout is incorrect.
You mean, you can't fix that?
>>Shouldn't this be done in HEAD first?
>
> There is no HEAD in subversion.
sorry, I meant trunk.
I've never done svn branch merging, but I suspect that you will have a
problem doing that if trunk doesn't have docs/ in it. But you probably
know better. Just remember that merging docs is much harder and more time
consuming than code.
--
__________________________________________________________________
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: svn commit: r156165 -
perl/modperl/branches/apache2-rename-unstable/docs
Posted by Joe Schaefer <jo...@sunstarsys.com>.
Stas Bekman <st...@stason.org> writes:
[...]
> hmm, why doing this in the new branch?
Because trunk's layout is incorrect.
> Shouldn't this be done in HEAD first?
There is no HEAD in subversion.
--
Joe Schaefer
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@perl.apache.org
For additional commands, e-mail: dev-help@perl.apache.org
Re: svn commit: r156165 - perl/modperl/branches/apache2-rename-unstable/docs
Posted by Stas Bekman <st...@stason.org>.
joes@apache.org wrote:
> Author: joes
> Date: Fri Mar 4 07:28:11 2005
> New Revision: 156165
>
> URL: http://svn.apache.org/viewcvs?view=rev&rev=156165
> Log:
> Copy 2.0 docs directly to Apache2:: rename branch
>
> Added:
> perl/modperl/branches/apache2-rename-unstable/docs/
> - copied from r156164, perl/modperl/docs/trunk/src/docs/2.0/
hmm, why doing this in the new branch? Shouldn't this be done in HEAD
first? If not how are you going to merge this branch with HEAD, if the
docs/ is not the same entity in the two?
--
__________________________________________________________________
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