[pLog-svn] r4226 - in plugins/trunk/jupload: jupload locale templates

[Oscar Renalias]

I'm not sure if there ever was any official note about this, but we  
decided to use the same approach we're using with core code with  
plugin code: trunk/ is for the bleeding edge stuff and all branch  
maintenance is done in the branches. So right now plugins/trunk/  
doesn't contain the latest versions of the plugin because those can  
be found in plugins/branches/lifetype-1.1. In fact, plugins/trunk/  
already contains some 1.2 stuff (I modified the 'authimage' and  
'contentfilter' plugin to use the new global plugin settings framework)

Sorry if this was a bit confusing, but we're doing it like this so  
that all modules work in the same way. Needless to say, we're doing  
the same thing with the 'templates' module.

I usually merge the code of a "point release" once the release has  
been tagged and released, although if somebody needs smaller  
incremental merges, that's been done too. I remember that during the  
development cycle of 1.1.1 Mark and Jon did several smaller merges  
(it's quite easy as svn allows merging code from a certain revision  
until a certain revision, so all you have to remember is the revision  
number of the last time you merged)

On 2 Nov 2006, at 00:20, Reto Hugi wrote:

> On 01.11.2006 23:13, Oscar Renalias wrote:
>> You're aware you're updating plugins/trunk/ and not plugins/branches/
>> lifetype-1.1, right? :)
>>
>
> hrm, well, yes. Does your asking mean, I should commit the changes to
> the 1.1 branch, too?
>
> And BTW, who does merging the changes from lt-1.1.2 to 1.2? do we do
> this when we release 1.1.2?
>
> _______________________________________________
> pLog-svn mailing list
> pLog-svn at devel.lifetype.net
> http://devel.lifetype.net/mailman/listinfo/plog-svn
>