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, <[email protected]> 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"/>
>
>
>
