Login | Register
My pages Projects Community openCollabNet

Discussions > dev [DISABLED] > Re: Problem with WC to URL copy in JavaHL 1.5.x

subversion
Discussion topic

There will be a brief maintenance window every Friday at 17:00 Pacific.
For further details, see CollabNet's maintenance and upgrade policy.

Back to topic list

Re: Problem with WC to URL copy in JavaHL 1.5.x

Author "Hyrum K dot Wright" <hyrum_wright at mail dot utexas dot edu>
Full name "Hyrum K dot Wright" <hyrum_wright at mail dot utexas dot edu>
Date 2008-12-06 11:49:49 PST
Message Mark Phippard wrote:
> Just to follow-up, this problem still happens in trunk. I have
> attached a patch to the JavaHL tests that causes the breakage. I also
> looked into the NotifyInformation class and there is no way to fix
> this problem in that class as the error occurs in a base class from
> the JDK that it inherits from.
>
> I can commit the patch but it causes breakage. I thought it might be
> easier to just give to someone that is willing to look into the
> problem.

The attached patch fixes the problem locally by setting the commit item path to
the same value as the url. The result will be the url being passed as the path
parameter to the notification callback. Do we do that for the other items in a
wc-to-url copy, or are the notification paths some sort of relative path?

-Hyrum

[[[
Fix JavaHL wc-to-url copies by providing a value for the notification path
callback.

* subversion/libsvn_client/copy.c
  (repos_to_repos_copy, wc_to_repos_copy): When creating parents, provide a
    value for the commit item path, which will then be used by the notification
    callback.
]]]


Index: subversion/libsvn_client/copy.c
====================​====================​====================​=======
--- subversion/libsvn_client/copy.c (revision 34599)
+++ subversion/libsvn_client/copy.c (working copy)
@@ -830,6 +830,7 @@ repos_to_repos_copy(​svn_commit_info_t **commit_inf
               item = svn_client_commit_it​em_create2(pool);
               item->url = svn_path_join(top_url, url, pool);
               item->state_flags = SVN_CLIENT_COMMIT_ITEM_ADD;
+ item->path = url;
               APR_ARRAY_PUSH(commit_items, svn_client_commit_item3_t *) = item;
             }
         }
@@ -842,6 +843,7 @@ repos_to_repos_copy(​svn_commit_info_t **commit_inf
           item = svn_client_commit_it​em_create2(pool);
           item->url = svn_path_join(top_url, info->dst_path, pool);
           item->state_flags = SVN_CLIENT_COMMIT_ITEM_ADD;
+ item->path = item->url;
           APR_ARRAY_PUSH(commit_items, svn_client_commit_item3_t *) = item;
           apr_hash_set(action_hash, info->dst_path, APR_HASH_KEY_STRING,
                        info);
@@ -1065,6 +1067,7 @@ wc_to_repos_copy(svn​_commit_info_t **commit_info_p
               item = svn_client_commit_it​em_create2(pool);
               item->url = url;
               item->state_flags = SVN_CLIENT_COMMIT_ITEM_ADD;
+ item->path = url;
               APR_ARRAY_PUSH(commit_items, svn_client_commit_item3_t *) = item;
             }
         }
@@ -1077,6 +1080,7 @@ wc_to_repos_copy(svn​_commit_info_t **commit_info_p
           item = svn_client_commit_it​em_create2(pool);
           item->url = pair->dst;
           item->state_flags = SVN_CLIENT_COMMIT_ITEM_ADD;
+ item->path = item->url;
           APR_ARRAY_PUSH(commit_items, svn_client_commit_item3_t *) = item;
         }

@@ -1128,6 +1132,7 @@ wc_to_repos_copy(svn​_commit_info_t **commit_info_p
           item->state_flags = SVN_CLIENT_COMMIT_ITEM_ADD;
           item->incoming_prop_changes = apr_array_make(pool, 1,
                                                        sizeof(svn_prop_t *));
+ item->path = url;
           APR_ARRAY_PUSH(commit_items, svn_client_commit_item3_t *) = item;
         }
     }
Attachments
signature.asc

« Previous message in topic | 4 of 10 | Next message in topic »

Messages

Show all messages in topic

Subject
Author
Full name
Date posted
+
Problem with WC to URL copy in JavaHL 1.5.x "Mark Phippard" <markphip at gmail dot com> "Mark Phippard" <markphip at gmail dot com> 2008-12-03 10:31:36 PST
     Re: Problem with WC to URL copy in JavaHL 1.5.x "Mark Phippard" <markphip at gmail dot com> "Mark Phippard" <markphip at gmail dot com> 2008-12-04 13:22:20 PST
         Re: Problem with WC to URL copy in JavaHL 1.5.x "Hyrum K dot Wright" <hyrum_wright at mail dot utexas dot edu> "Hyrum K dot Wright" <hyrum_wright at mail dot utexas dot edu> 2008-12-04 13:23:52 PST
         Re: Problem with WC to URL copy in JavaHL 1.5.x "Hyrum K dot Wright" <hyrum_wright at mail dot utexas dot edu> "Hyrum K dot Wright" <hyrum_wright at mail dot utexas dot edu> 2008-12-06 11:49:49 PST
             Re: Problem with WC to URL copy in JavaHL 1.5.x "Mark Phippard" <markphip at gmail dot com> "Mark Phippard" <markphip at gmail dot com> 2008-12-06 12:13:40 PST
             Re: Problem with WC to URL copy in JavaHL 1.5.x "Mark Phippard" <markphip at gmail dot com> "Mark Phippard" <markphip at gmail dot com> 2008-12-09 11:24:59 PST
                 Re: Problem with WC to URL copy in JavaHL 1.5.x "Hyrum K dot Wright" <hyrum_wright at mail dot utexas dot edu> "Hyrum K dot Wright" <hyrum_wright at mail dot utexas dot edu> 2008-12-09 12:45:14 PST
                     Re: Problem with WC to URL copy in JavaHL 1.5.x "Mark Phippard" <markphip at gmail dot com> "Mark Phippard" <markphip at gmail dot com> 2008-12-09 12:58:09 PST
                         Re: Problem with WC to URL copy in JavaHL 1.5.x "Hyrum K dot Wright" <hyrum_wright at mail dot utexas dot edu> "Hyrum K dot Wright" <hyrum_wright at mail dot utexas dot edu> 2008-12-09 12:59:03 PST
                             Re: Problem with WC to URL copy in JavaHL 1.5.x "Mark Phippard" <markphip at gmail dot com> "Mark Phippard" <markphip at gmail dot com> 2008-12-09 13:11:32 PST
Messages per page: