Re: [Bashburn-info] Sorry for all the confusion. I just merged...

[Nick W. <ni...@li...>]

On Mon, 22 Sep 2008 22:28:19 -0400 (EDT)
"Steven W. Orr" <st...@sy...> wrote:

> I just merged from release/3.0@533 to trunk.
> 
> New rev is 561. I relaly hope I didn't screw anything up.
> 

Seems OK.

Right, what needs to happen is if any issues are found in RELEASE, then
we fix it in TRUNK.  When it is deemed fixed, then it gets moved to
RELEASE branch to fix that issue.

That way, the two trees are relatively related.  As an aside, things in
TRUNK may break certain things that fix the RELEASE tree, so we can't
do anything until they are all fixed.  The idea here is that soon
RELEASE will be stable enough to use without errors.

What was happening though, was RELEASE had fixes that TRUNK never had,
so the development branch TRUNK was worse than/behind the RELEASE
tree.

Nick
-- 
Free Software Foundation Associate Member 5508