Reminder to all committers

[Janne Jalkanen <Ja...@ecyrd.com>]

All,

please don't forget to update *both* trunk and JSPWIKI_2_8_BRANCH if  
you put in a fix.  I try to merge in fixes from the 2.8 branch into  
the trunk as often as I can, but I see people now committing into the  
trunk some things that need to go into the branch as well.

2.8.1 will be built from the JSPWIKI_2_8_BRANCH, not the trunk.  We  
don't want stuff to go missing from there when we build - and the  
further apart these two drift, the more complex all merge operations  
will be.

/Janne

Re: Reminder to all committers

[Janne Jalkanen <Ja...@ecyrd.com>]

> The Release.java needs to be updated in the trunk, too - it currently
> shows up as 2.8.0-beta-21.

I know... The problem is that we didn't end up anywhere in the  
discussion whether that should be 2.9.0-svn-xx or 3.0.0-svn-xx.

The latter would be consistent with the new scheme using build  
numbers; the former consistent with the scheme we used up until 2.6.

/Janne

Re: Reminder to all committers

[Florian Holeczek <fl...@holeczek.de>]

The Release.java needs to be updated in the trunk, too - it currently
shows up as 2.8.0-beta-21.

Regards
 Florian

Ursprüngliche Nachricht vom 06.11.2008 um 09:08:
> All,

> please don't forget to update *both* trunk and JSPWIKI_2_8_BRANCH if  
> you put in a fix.  I try to merge in fixes from the 2.8 branch into  
> the trunk as often as I can, but I see people now committing into the
> trunk some things that need to go into the branch as well.

> 2.8.1 will be built from the JSPWIKI_2_8_BRANCH, not the trunk.  We  
> don't want stuff to go missing from there when we build - and the  
> further apart these two drift, the more complex all merge operations  
> will be.

> /Janne