continuum-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From José Morales Martínez <jmora...@gmv.com>
Subject RE: svn commit: r776132 - in /continuum/trunk/continuum-webapp/src/main: resources/localization/Continuum.properties webapp/WEB-INF/jsp/admin/editPurgeConfiguration.jsp
Date Tue, 19 May 2009 00:46:09 GMT
Sorry. I though with merge info was sufficient. I will take this notation :

 [CONTINUUM-XXXX] merge revision VVVVVV from branch BBBBBB

This merge is about [CONTINUUM-2016].
-----
Jose
________________________________________
De: Wendy Smoak [wsmoak@gmail.com]
Enviado el: martes, 19 de mayo de 2009 1:22
Para: dev@continuum.apache.org
Asunto: Re: svn commit: r776132 - in /continuum/trunk/continuum-webapp/src/main:        resources/localization/Continuum.properties
webapp/WEB-INF/jsp/admin/editPurgeConfiguration.jsp

I know it's just a one-line change, but can you please include the
reason and/or JIRA issue in the commit message for the merge?

You can fix the commit log message after the fact with "svn propedit
--revprop -r12345 svn:log" ('svn help propedit' for more info.)

Thanks,
--
Wendy

On Mon, May 18, 2009 at 4:17 PM,  <jmorales@apache.org> wrote:
> Author: jmorales
> Date: Mon May 18 23:17:02 2009
> New Revision: 776132
>
> URL: http://svn.apache.org/viewvc?rev=776132&view=rev
> Log:
> merge -r 775956:776127 from 1.3.x branch
>
> Modified:
>    continuum/trunk/continuum-webapp/src/main/resources/localization/Continuum.properties
>    continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/editPurgeConfiguration.jsp
>
> Modified: continuum/trunk/continuum-webapp/src/main/resources/localization/Continuum.properties
> URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/resources/localization/Continuum.properties?rev=776132&r1=776131&r2=776132&view=diff
> ==============================================================================
> --- continuum/trunk/continuum-webapp/src/main/resources/localization/Continuum.properties
(original)
> +++ continuum/trunk/continuum-webapp/src/main/resources/localization/Continuum.properties
Mon May 18 23:17:02 2009
> @@ -1000,7 +1000,7 @@
>  purgeConfig.defaultPurge.label = Is it Default?
>  purgeConfig.schedule.label = Schedule
>  purgeConfig.description.label = Description
> -purgeConfig.enabled.label = Enabled
> +purgeConfig.enabled.label = Enabled Purge Configuration
>  purgeConfig.no.repositories = No repositories to purge
>
>  #-----------------------------------------------------------------------
>
> Modified: continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/editPurgeConfiguration.jsp
> URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/editPurgeConfiguration.jsp?rev=776132&r1=776131&r2=776132&view=diff
> ==============================================================================
> --- continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/editPurgeConfiguration.jsp
(original)
> +++ continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/admin/editPurgeConfiguration.jsp
Mon May 18 23:17:02 2009
> @@ -68,6 +68,7 @@
>             <s:select label="%{getText('purgeConfig.schedule.label')}" name="scheduleId"
list="schedules"
>                        headerKey="-1" headerValue=""/>
>             <s:textfield label="%{getText('purgeConfig.description.label')}" name="description"/>
> +            <s:checkbox label="%{getText('purgeConfig.enabled.label')}" name="enabled"/>
>           </table>
>           <s:hidden name="purgeConfigId"/>
>           <s:hidden name="purgeType"/>
>
>
>

______________________
Este mensaje, y en su caso, cualquier fichero anexo al mismo,
 puede contener informacion clasificada por su emisor como confidencial
 en el marco de su Sistema de Gestion de Seguridad de la 
Informacion siendo para uso exclusivo del destinatario, quedando 
prohibida su divulgacion copia o distribucion a terceros sin la 
autorizacion expresa del remitente. Si Vd. ha recibido este mensaje 
 erroneamente, se ruega lo notifique al remitente y proceda a su borrado. 
Gracias por su colaboracion.
______________________
This message including any attachments may contain confidential 
information, according to our Information Security Management System,
 and intended solely for a specific individual to whom they are addressed.
 Any unauthorised copy, disclosure or distribution of this message
 is strictly forbidden. If you have received this transmission in error,
 please notify the sender immediately and delete it.
______________________

Mime
View raw message