You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@forrest.apache.org by David Crossley <cr...@indexgeo.com.au> on 2002/11/21 06:16:03 UTC
branch management - yikes
I see that Jeff is maintaining FORREST_02_BRANCH
but i have not been doing so. Do we really need to
do this?
Many fixes that we make to head cvs are also
needed in the branch. Is there an easier way?
If not, then where is the line to be drawn?
--David
Re: branch management - yikes
Posted by Nicola Ken Barozzi <ni...@apache.org>.
Jeff Turner wrote:
> On Fri, Nov 22, 2002 at 03:33:52PM +1100, David Crossley wrote:
> ...
>
>>So do we intend to keep the Forrest core xdocs for the
>>release branch in sync with the head of cvs?
>
> I hope not..
In the release branch we should have only bugfixes. And honestly if they
are not blockers, since we are in 0.x phase, there is no big need to put
them *all* in.
IMHO that is.
>>I was thinking of manually updating the Forrest website.
>>I gather that i 'cvs commit' the *.[html|pdf] into the
>>xml-site/targets/forrest module.
>
> Yes, 'cp -r build/site/* ../xml-site/targets/forrest'.
--
Nicola Ken Barozzi nicolaken@apache.org
- verba volant, scripta manent -
(discussions get forgotten, just code remains)
---------------------------------------------------------------------
--
Nicola Ken Barozzi nicolaken@apache.org
- verba volant, scripta manent -
(discussions get forgotten, just code remains)
---------------------------------------------------------------------
Re: branch management - yikes
Posted by David Crossley <cr...@indexgeo.com.au>.
Jeff Turner wrote:
> David Crossley wrote:
> ...
> > So do we intend to keep the Forrest core xdocs for the
> > release branch in sync with the head of cvs?
>
> I hope not..
That is good then.
> > I was thinking of manually updating the Forrest website.
> > I gather that i 'cvs commit' the *.[html|pdf] into the
> > xml-site/targets/forrest module.
>
> Yes, 'cp -r build/site/* ../xml-site/targets/forrest'.
Thanks, we can each do it manually from time-to-time
until we get the forrestbot happening automatically.
--David
Re: branch management - yikes
Posted by Jeff Turner <je...@apache.org>.
On Fri, Nov 22, 2002 at 03:33:52PM +1100, David Crossley wrote:
...
> So do we intend to keep the Forrest core xdocs for the
> release branch in sync with the head of cvs?
I hope not..
> I was thinking of manually updating the Forrest website.
> I gather that i 'cvs commit' the *.[html|pdf] into the
> xml-site/targets/forrest module.
Yes, 'cp -r build/site/* ../xml-site/targets/forrest'.
--Jeff
> >From which Forrest branch?
>
> --David
>
Re: branch management - yikes
Posted by David Crossley <cr...@indexgeo.com.au>.
David Crossley wrote:
> Jeff Turner wrote:
> > David Crossley wrote:
> > > I see that Jeff is maintaining FORREST_02_BRANCH
> > > but i have not been doing so. Do we really need to
> > > do this?
> >
> > Only critical bugfixes that are easy to port.
> > eg, if that forrest.bat patch proves stable, I'll move it over.
> >
> > > Many fixes that we make to head cvs are also
> > > needed in the branch.
> >
> > Not really.. there's only been two so far. I'm happy for everyone to
> > ignore the 0.2 branch, and I'll just watch commits and port when
> > necessary.
>
> I became concerned about the validation and entity
> catalog resolver changes that i recently made to head.
> I also worried about documentation changes, as i have
> seen a branch management nightmare brewing with
> Cocoon.
>
> Your words make me rest easier :-)
>
> > > Is there an easier way?
> >
> > 'cvs diff -j HEAD', and then 'cvs update -j HEAD' pull in
> > changes from the head onto the branch.
>
> Eek. Sounds okay for a few simple files, but could
> be a worry at the top-level after a branches have
> diverged. I will try it when i feel brave.
>
> > --Jeff
> >
> > > If not, then where is the line to be drawn?
> > >
> > > --David
So do we intend to keep the Forrest core xdocs for the
release branch in sync with the head of cvs?
I was thinking of manually updating the Forrest website.
I gather that i 'cvs commit' the *.[html|pdf] into the
xml-site/targets/forrest module.
>From which Forrest branch?
--David
Re: branch management - yikes
Posted by David Crossley <cr...@indexgeo.com.au>.
Jeff Turner wrote:
> David Crossley wrote:
> > I see that Jeff is maintaining FORREST_02_BRANCH
> > but i have not been doing so. Do we really need to
> > do this?
>
> Only critical bugfixes that are easy to port.
> eg, if that forrest.bat patch proves stable, I'll move it over.
>
> > Many fixes that we make to head cvs are also
> > needed in the branch.
>
> Not really.. there's only been two so far. I'm happy for everyone to
> ignore the 0.2 branch, and I'll just watch commits and port when
> necessary.
I became concerned about the validation and entity
catalog resolver changes that i recently made to head.
I also worried about documentation changes, as i have
seen a branch management nightmare brewing with
Cocoon.
Your words make me rest easier :-)
> > Is there an easier way?
>
> 'cvs diff -j HEAD', and then 'cvs update -j HEAD' pull in
> changes from the head onto the branch.
Eek. Sounds okay for a few simple files, but could
be a worry at the top-level after a branches have
diverged. I will try it when i feel brave.
> --Jeff
>
> > If not, then where is the line to be drawn?
> >
> > --David
Re: branch management - yikes
Posted by Jeff Turner <je...@apache.org>.
On Thu, Nov 21, 2002 at 04:16:03PM +1100, David Crossley wrote:
> I see that Jeff is maintaining FORREST_02_BRANCH
> but i have not been doing so. Do we really need to
> do this?
Only critical bugfixes that are easy to port.. eg, if that forrest.bat
patch proves stable, I'll move it over.
> Many fixes that we make to head cvs are also
> needed in the branch.
Not really.. there's only been two so far. I'm happy for everyone to
ignore the 0.2 branch, and I'll just watch commits and port when
necessary.
> Is there an easier way?
'cvs diff -j HEAD', and then 'cvs update -j HEAD' pull in changes from
the head onto the branch.
--Jeff
> If not, then where is the line to be drawn?
>
> --David
>
>