subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From julianf...@apache.org
Subject svn commit: r1199271 - in /subversion/branches/showing-merge-info/subversion/libsvn_client: mergeinfo.c ra.c
Date Tue, 08 Nov 2011 14:58:07 GMT
Author: julianfoad
Date: Tue Nov  8 14:58:07 2011
New Revision: 1199271

URL: http://svn.apache.org/viewvc?rev=1199271&view=rev
Log:
On the 'showing-merge-info' branch: Fix two bugs following r1199222.

* subversion/libsvn_client/mergeinfo.c
  (svn_client__get_branch_to_branch_mergeino): If there's no mergeinfo,
    don't crash, just make an empty hash.

* subversion/libsvn_client/ra.c
  (svn_client__get_location_segments): Don't assume the target is the
    current directory. (Found by philip.)

Modified:
    subversion/branches/showing-merge-info/subversion/libsvn_client/mergeinfo.c
    subversion/branches/showing-merge-info/subversion/libsvn_client/ra.c

Modified: subversion/branches/showing-merge-info/subversion/libsvn_client/mergeinfo.c
URL: http://svn.apache.org/viewvc/subversion/branches/showing-merge-info/subversion/libsvn_client/mergeinfo.c?rev=1199271&r1=1199270&r2=1199271&view=diff
==============================================================================
--- subversion/branches/showing-merge-info/subversion/libsvn_client/mergeinfo.c (original)
+++ subversion/branches/showing-merge-info/subversion/libsvn_client/mergeinfo.c Tue Nov  8
14:58:07 2011
@@ -817,6 +817,8 @@ svn_client__get_branch_to_branch_mergein
                                            target->path_or_url,
                                            &target->peg_revision,
                                            ctx, result_pool, scratch_pool));
+  if (*mergeinfo_cat == NULL)
+    *mergeinfo_cat = apr_hash_make(result_pool);
 
   /* Filter, keeping only the merges from SOURCE_BRANCH location segments. */
   SVN_ERR(filter_mergeinfo_catalog(*mergeinfo_cat, source_locations,

Modified: subversion/branches/showing-merge-info/subversion/libsvn_client/ra.c
URL: http://svn.apache.org/viewvc/subversion/branches/showing-merge-info/subversion/libsvn_client/ra.c?rev=1199271&r1=1199270&r2=1199271&view=diff
==============================================================================
--- subversion/branches/showing-merge-info/subversion/libsvn_client/ra.c (original)
+++ subversion/branches/showing-merge-info/subversion/libsvn_client/ra.c Tue Nov  8 14:58:07
2011
@@ -611,7 +611,8 @@ svn_client__get_location_segments(apr_ar
                                           ctx, scratch_pool));
   SVN_ERR(svn_client__repos_locations(&young_url, &young_rev,
                                       &old_url, &old_rev,
-                                      ra_session, "", &target->peg_revision,
+                                      ra_session, target->abspath_or_url,
+                                      &target->peg_revision,
                                       young_revision, old_revision,
                                       ctx, scratch_pool));
   SVN_ERR(svn_client__repos_location_segments(segments, ra_session, "", rev,



Mime
View raw message