[Geoserver-devel] Killing the branch culture

Hi guys,

After chatting with Jody and following the release discussion thread it is becoming increasingly hard to manage 1.4.x and keep it in sync with trunk, and now this other "beta" branch that seems to be the new trunk as we are releaseing off of it.

Is there any reason for this beta branch? I know brent has been doing all his work there, but I am not sure why? From what I can tell from the commits going by he is not changing any "core" files, only adding new ones. Maybe I am wrong.

-Justin

--
Justin Deoliveira
The Open Planning Project
jdeolive@anonymised.com

Justin Deoliveira wrote:

Hi guys,

After chatting with Jody and following the release discussion thread it is becoming increasingly hard to manage 1.4.x and keep it in sync with trunk, and now this other "beta" branch that seems to be the new trunk as we are releaseing off of it.
  

I should of grabbed the logs from IRC - sorry man.

Is there any reason for this beta branch? I know brent has been doing all his work there, but I am not sure why? From what I can tell from the commits going by he is not changing any "core" files, only adding new ones. Maybe I am wrong.
  

I suspect Brent is just out of time to merge his changes onto trunk and do releases from there?
Perhaps if we merge his changes onto trunk ...

Brent was going to try and wake up early to talk to us, perhaps we can come back to the office after
dinner and see if he is around.

Jody

The beta branch was created so Dave and I could work remotely on the same thing, and test geotools 2.2.x with geoserver. It was the very core files that were being worked on and tested. That was where the first 1.3.1 beta release came from.
The kml development went on there because we merged the kml code from the wcs branch, and the ecs branch uses geotools 2.2.x. At the time the addition of geotools2.2.x wasn't tested and we didn't want to inflict pain on anyone using trunk. It was an experimental testing ground.
The origional plan, was to develop the kml on the branch, then merge the geotools2.2.x geoserver code over to trunk with the kml code. But the IP release has had to change the order of how that happened. Now we must quickly throw out a release with the IP fixes, but that also resembles the previous release (one that has geotools2.2.x). If we go from 2.2.x support, to no 2.2.x support, people will wonder, and it doesn't make sense.
Hopefully that clears things up.

Brent Owens
(The Open Planning Project)

Justin Deoliveira wrote:

Hi guys,

After chatting with Jody and following the release discussion thread it is becoming increasingly hard to manage 1.4.x and keep it in sync with trunk, and now this other "beta" branch that seems to be the new trunk as we are releaseing off of it.

Is there any reason for this beta branch? I know brent has been doing all his work there, but I am not sure why? From what I can tell from the commits going by he is not changing any "core" files, only adding new ones. Maybe I am wrong.

-Justin