Forum OpenACS Development: CVS: bugfixes only go to a branch

Posted by Eduardo Pérez on 11/27/03 09:48 PM

Why bugfixes only go to a branch?
Shouldn't bugfixes be applied to HEAD to?
I know the branch will be merged with HEAD later but I don't understand why that is not done at both branches in the first time.
It's a problem for developers not having bugfixes in HEAD.

2: Re: CVS: bugfixes only go to a branch (response to 1)

Posted by Jeff Davis on 11/27/03 10:12 PM

Its mostly a resource issue, we feel it's more important to get the bug fixes in for the pending release than it is to keep head up to date so thats what we focus on.

It also ends up being easier to merge at well defined spots than to merge from the release branch continually.

Also, we don't want to merge from HEAD to the release branch (except in a very controlled way) since then we risk pulling in code which should not be released.

Eduardo, what work on HEAD is it you need that is not on the release branch?

3: Re: CVS: bugfixes only go to a branch (response to 2)

Posted by Eduardo Pérez on 11/27/03 11:09 PM

<blockquote> Its mostly a resource issue, we feel it's more important
to get the bug fixes in for the pending release than it
is to keep head up to date so thats what we focus on.
</blockquote>
But, HEAD developers will have a hard time with bugs in HEAD.

<blockquote> It also ends up being easier to merge at well defined spots
than to merge from the release branch continually.
</blockquote>
It may be easier. I don't know if it is.

<blockquote> Also, we don't want to merge from HEAD to the release branch
(except in a very controlled way) since then we risk pulling
in code which should not be released.
</blockquote>
Of course not.

<blockquote> Eduardo, what work on HEAD is it you need that is not on the
release branch?
</blockquote>
Nothing, but I was hit by a bug in HEAD that was fixed in the branch and I had to move to oacs-5-0.