docs branch

[Dave Cottlehuber <dc...@jsonified.com>]

Hi,

I'm not comfortable that we are ready to merge the docs branch
directly into a release without some further testing & cleanup. We can
still release the content via http://docs.couchdb.org along with the
1.3.0 release, we just wouldn't ship the integrated tools with the
source.

Noah's put a huge amount of quality work into this incl generating
HTML, PDF and texinfo all in one, and this isn't a comment on his
fantastic contribution, but at the moment, the branch consists of
three main streams and I've not gotten it to a point where we would
have a clean merge.

- import, update & additions to the core .rst files
- autotools tidyup, upgrade & M4 macro replacements
- support Sphinx/PDF/texinfo generation within autotools

I've had a first crack at this here
https://github.com/dch/couchdb/tree/docs-1.3.x but it still needs more
work.

A+
Dave

Re: docs branch

[Noah Slater <ns...@apache.org>]

Okay.


On 1 December 2012 20:21, Dave Cottlehuber <dc...@jsonified.com> wrote:

> On 1 December 2012 16:01, Noah Slater <ns...@apache.org> wrote:
> > Why is this only coming up now? We've been talking about this for weeks.
>
> Mainly because this week is the first time I've seriously worked
> through squashing and cleaning it up as prep for merging it.
>
> > I also complete disagree with the idea that we need more testing. I have
> a
> > few more tiny things that I want to do, but once I am happy, then I think
> > we're ready to merge. And I think this can happen today.
> >
> > What is the actual problem here? Are you running into problems getting
> the
> > branch merged into master? I presume we are trying to merge it into
> master
> > in one changset, and then merge that into 1.3.x.
>
> Per IRC discussion we will do this as cherrypicks into 1.3.x and master
> equally.
>
> > There is no need to split the changes into logical chunks, IMO.
>
> Bringing a single large change in one go makes it very hard to work
> back to a single commit if you're hunting for a regression that isn't
> covered in a test suite.
>
> If we can separate out the autotools upgrade part from the rest, I'd
> feel much more comfortable. Let's have a crack at that tonight.
>
> A+
> Dave
>



-- 
NS

Re: docs branch

[Dave Cottlehuber <dc...@jsonified.com>]

On 1 December 2012 16:01, Noah Slater <ns...@apache.org> wrote:
> Why is this only coming up now? We've been talking about this for weeks.

Mainly because this week is the first time I've seriously worked
through squashing and cleaning it up as prep for merging it.

> I also complete disagree with the idea that we need more testing. I have a
> few more tiny things that I want to do, but once I am happy, then I think
> we're ready to merge. And I think this can happen today.
>
> What is the actual problem here? Are you running into problems getting the
> branch merged into master? I presume we are trying to merge it into master
> in one changset, and then merge that into 1.3.x.

Per IRC discussion we will do this as cherrypicks into 1.3.x and master equally.

> There is no need to split the changes into logical chunks, IMO.

Bringing a single large change in one go makes it very hard to work
back to a single commit if you're hunting for a regression that isn't
covered in a test suite.

If we can separate out the autotools upgrade part from the rest, I'd
feel much more comfortable. Let's have a crack at that tonight.

A+
Dave

Re: docs branch

[Noah Slater <ns...@apache.org>]

Why is this only coming up now? We've been talking about this for weeks.

I also complete disagree with the idea that we need more testing. I have a
few more tiny things that I want to do, but once I am happy, then I think
we're ready to merge. And I think this can happen today.

What is the actual problem here? Are you running into problems getting the
branch merged into master? I presume we are trying to merge it into master
in one changset, and then merge that into 1.3.x.

There is no need to split the changes into logical chunks, IMO.


On 1 December 2012 14:38, Dave Cottlehuber <dc...@jsonified.com> wrote:

> Hi,
>
> I'm not comfortable that we are ready to merge the docs branch
> directly into a release without some further testing & cleanup. We can
> still release the content via http://docs.couchdb.org along with the
> 1.3.0 release, we just wouldn't ship the integrated tools with the
> source.
>
> Noah's put a huge amount of quality work into this incl generating
> HTML, PDF and texinfo all in one, and this isn't a comment on his
> fantastic contribution, but at the moment, the branch consists of
> three main streams and I've not gotten it to a point where we would
> have a clean merge.
>
> - import, update & additions to the core .rst files
> - autotools tidyup, upgrade & M4 macro replacements
> - support Sphinx/PDF/texinfo generation within autotools
>
> I've had a first crack at this here
> https://github.com/dch/couchdb/tree/docs-1.3.x but it still needs more
> work.
>
> A+
> Dave
>



-- 
NS