Confused by Tufão branches and documentation

[marco.m]

Hey Vinícius,

I think there is a need to explain better in README.md the
relationship between Tufão branches, tags, documentation and releases.

There are two branches: master and 1.0 (plus other two that I think
are not important for this discussion). There are two versions of the
documentation: 0.x (currently 0.6) and 1.0-WIP.

My understanding was that branch master was associated to the 0.x
series and documentation and branch 1.0 was associated to the 1.x
series and documentation.

But in the documentation for 0.x I can see that HttpServerRequest has
method setUrl(), while the code in branch master doesn't have it.

After a bit of confusion I discovered that there is a tag 0.6, that
contains setUrl().

So: is master used at all? If I want to follow the 0.x series, which
branch do I follow?

thanks
marco

[Vinícius dos Santos Oliveira]

2013/3/22 marco.m <marco.molte...@gmail.com>

I think there is a need to explain better in README.md the
relationship between Tufão branches, tags, documentation and releases.

Yes, it's true.

There are two branches: master and 1.0 (plus other two that I think
are not important for this discussion). There are two versions of the
documentation: 0.x (currently 0.6) and 1.0-WIP.

My understanding was that branch master was associated to the 0.x
series and documentation and branch 1.0 was associated to the 1.x
series and documentation.

But in the documentation for 0.x I can see that HttpServerRequest has
method setUrl(), while the code in branch master doesn't have it.

After a bit of confusion I discovered that there is a tag 0.6, that
contains setUrl().

I'll edit the following wiki page to document the git structure, but it's not following any design right now:

https://github.com/vinipsmaker/tufao/wiki/Repository

And I'll put a link to this page under the README.md file.

So: is master used at all? If I want to follow the 0.x series, which
branch do I follow?

Before 1.0, master was intended for development of the next version and tags for stable versions.

Some time after I started 1.0 development, I became worried about the merge of the two very different branches and I stopped to use master.

I created a new branch some seconds ago to solve the problem of 0.x development:

https://github.com/vinipsmaker/tufao/tree/0.x

--
Vinícius dos Santos Oliveira
https://plus.google.com/118295250366112843114
http://vinipsmaker.wordpress.com/

Linux user #481186

Majoring in Computer Science (UFAL)

[Vinícius dos Santos Oliveira]

2013/3/22 Vinícius dos Santos Oliveira <vini.i...@gmail.com>

https://github.com/vinipsmaker/tufao/wiki/Repository

Well... it's updated now.

[Marco Molteni]

On 25 Mar 2013, at 19:27, Vinícius dos Santos Oliveira wrote:

> 2013/3/22 Vinícius dos Santos Oliveira <vini.i...@gmail.com>
> https://github.com/vinipsmaker/tufao/wiki/Repository
>
> Well... it's updated now.

thanks again :-) I hope I will be able to check both the code and docs this week.

marco

[Vinícius dos Santos Oliveira]

2013/3/25 Marco Molteni <marco....@laposte.net>

Thanks for the feedback.

=)