[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Re: svn commit: r1189190 - /subversion/trunk/subversion/bindings/javahl/native/CreateJ.cpp

From: Mark Phippard <markphip_at_gmail.com>
Date: Wed, 26 Oct 2011 14:38:02 -0400

I backported this to my 1.7.x branch for testing with Subclipse but it
does not seem to be working for me. To the best that I can tell I am
using the new library. The version changed from 1.7.1 to 1.7.2 (under
dev). I did make clean-javahl just in case that was the problem.

Here is a commit I did:

r1345 | admin | 2011-10-26 14:10:40 -0400 (Wed, 26 Oct 2011) | 1 line
Changed paths:
   A ../actions/NewClassTest.java
   D ../actions/OpenInBrowserAction.java
   M ../extensions/CollabnetSiteProviderManager.java
   D ../preferences

I am shortening the paths to make it easier.

I have a working copy set to r1344 and I run the JavaHL status -u API
and log the results of "repositoryTextStatus" and "Path". This is
what I get:

modified ../extensions/CollabnetSiteProviderManager.java
non-svn ../actions/NewClassTest.java
normal ../actions/OpenInBrowserAction.java
modified ../actions
normal ../preferences

This what I would have expected:

modified ../extensions/CollabnetSiteProviderManager.java
added ../actions/NewClassTest.java
deleted ../actions/OpenInBrowserAction.java
deleted ../preferences

And I guess I might have expected to also get:

modified ../actions

Any ideas why it does not work still?

On Wed, Oct 26, 2011 at 9:16 AM, <rhuijben_at_apache.org> wrote:
> Author: rhuijben
> Date: Wed Oct 26 13:16:12 2011
> New Revision: 1189190
>
> URL: http://svn.apache.org/viewvc?rev=1189190&view=rev
> Log:
> * subversion/bindings/javahl/native/CreateJ.cpp
>  (CreateJ::Status): Fold the node repos_node_status into repos_text_status
>    like how it was handled in Subversion 1.6. Just reporting the new
>    repos_text_status value breaks the reporting of deleted and added nodes.
>
> Modified:
>    subversion/trunk/subversion/bindings/javahl/native/CreateJ.cpp
>
> Modified: subversion/trunk/subversion/bindings/javahl/native/CreateJ.cpp
> URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/javahl/native/CreateJ.cpp?rev=1189190&r1=1189189&r2=1189190&view=diff
> ==============================================================================
> --- subversion/trunk/subversion/bindings/javahl/native/CreateJ.cpp (original)
> +++ subversion/trunk/subversion/bindings/javahl/native/CreateJ.cpp Wed Oct 26 13:16:12 2011
> @@ -533,11 +533,16 @@ CreateJ::Status(svn_wc_context_t *wc_ctx
>       || text_status == svn_wc_status_conflicted)
>     text_status = status->text_status;
>
> +  enum svn_wc_status_kind repos_text_status = status->node_status;
> +
> +  if (status->repos_node_status == svn_wc_status_modified
> +      || status->repos_node_status == svn_wc_status_conflicted)
> +    repos_text_status = status->repos_text_status;
> +
>   jboolean jIsConflicted = (status->conflicted == 1) ? JNI_TRUE : JNI_FALSE;
>   jobject jTextType = EnumMapper::mapStatusKind(text_status);
>   jobject jPropType = EnumMapper::mapStatusKind(status->prop_status);
> -  jobject jRepositoryTextType = EnumMapper::mapStatusKind(
> -                                                  status->repos_text_status);
> +  jobject jRepositoryTextType = EnumMapper::mapStatusKind(repos_text_status);
>   jobject jRepositoryPropType = EnumMapper::mapStatusKind(
>                                                   status->repos_prop_status);
>   jboolean jIsCopied = (status->copied == 1) ? JNI_TRUE: JNI_FALSE;
>
>
>

-- 
Thanks
Mark Phippard
http://markphip.blogspot.com/
Received on 2011-10-26 20:38:35 CEST

This is an archived mail posted to the Subversion Dev mailing list.