15-04-2008 03:32 hwright_at_tigris.org <hwright_at_tigris.org> napisał(a):
> Author: hwright
> Date: Mon Apr 14 18:32:57 2008
> New Revision: 30604
>
> Log:
> Merge r30597 from trunk:
>
> * r30597
> JavaHL: Added missing notify mapping for Replaced action.
> Votes:
> +1: markphip, hwright
>
> Modified:
> branches/1.5.x/STATUS
> branches/1.5.x/subversion/bindings/javahl/native/EnumMapper.cpp
> branches/1.5.x/subversion/bindings/javahl/src/org/tigris/subversion/javahl/NotifyAction.java
Why svn:mergeinfo wasn't changed?
>
> Modified: branches/1.5.x/STATUS
> URL: http://svn.collab.net/viewvc/svn/branches/1.5.x/STATUS?pathrev=30604&r1=30603&r2=30604
> ==============================================================================
> --- branches/1.5.x/STATUS Mon Apr 14 18:32:04 2008 (r30603)
> +++ branches/1.5.x/STATUS Mon Apr 14 18:32:57 2008 (r30604)
> @@ -29,9 +29,3 @@ Candidate changes:
>
> Approved changes (all releases):
> ================================
> -
> - * r30597
> - JavaHL: Added missing notify mapping for Replaced action.
> - Votes:
> - +1: markphip, hwright
> -
>
> Modified: branches/1.5.x/subversion/bindings/javahl/native/EnumMapper.cpp
> URL: http://svn.collab.net/viewvc/svn/branches/1.5.x/subversion/bindings/javahl/native/EnumMapper.cpp?pathrev=30604&r1=30603&r2=30604
> ==============================================================================
> --- branches/1.5.x/subversion/bindings/javahl/native/EnumMapper.cpp Mon Apr 14 18:32:04 2008 (r30603)
> +++ branches/1.5.x/subversion/bindings/javahl/native/EnumMapper.cpp Mon Apr 14 18:32:57 2008 (r30604)
> @@ -158,6 +158,10 @@ jint EnumMapper::mapNotifyAction(svn_wc_
> /* Got an add in an update. */
> return org_tigris_subversion_javahl_NotifyAction_update_add;
>
> + case svn_wc_notify_update_replace:
> + /* Got a replaced in an update. */
> + return org_tigris_subversion_javahl_NotifyAction_update_replaced;
> +
> case svn_wc_notify_update_update:
> /* Got any other action in an update. */
> return org_tigris_subversion_javahl_NotifyAction_update_update;
>
> Modified: branches/1.5.x/subversion/bindings/javahl/src/org/tigris/subversion/javahl/NotifyAction.java
> URL: http://svn.collab.net/viewvc/svn/branches/1.5.x/subversion/bindings/javahl/src/org/tigris/subversion/javahl/NotifyAction.java?pathrev=30604&r1=30603&r2=30604
> ==============================================================================
> --- branches/1.5.x/subversion/bindings/javahl/src/org/tigris/subversion/javahl/NotifyAction.java Mon Apr 14 18:32:04 2008 (r30603)
> +++ branches/1.5.x/subversion/bindings/javahl/src/org/tigris/subversion/javahl/NotifyAction.java Mon Apr 14 18:32:57 2008 (r30604)
> @@ -140,6 +140,12 @@ public interface NotifyAction
> public static final int merge_begin = 28;
>
> /**
> + * @since 1.5
> + * Got a replaced in an update.
> + */
> + public static final int update_replaced = 29;
> +
> + /**
> * textual representation of the action types
> */
> public static final String[] actionNames =
> @@ -173,5 +179,6 @@ public interface NotifyAction
> "changelist set",
> "changelist cleared",
> "merge begin",
> + "replaced"
> };
> }
>
Received on 2008-04-16 17:16:46 CEST