[prev in list] [next in list] [prev in thread] [next in thread] 

List:       subversion-cvs
Subject:    svn commit: r28156 - trunk/subversion/libsvn_client
From:       cmpilato () tigris ! org
Date:       2007-11-29 22:04:55
Message-ID: 200711292204.lATM4tbl001089 () svn2 ! sjc ! collab ! net
[Download RAW message or body]

Author: cmpilato
Date: Thu Nov 29 14:04:55 2007
New Revision: 28156

Log:
Fix some bogosity in path construction.

* subversion/libsvn_client/mergeinfo.c
  (svn_client_mergeinfo_get_merged): Don't construct uncanonical URLs!

Found by: dlr


Modified:
   trunk/subversion/libsvn_client/mergeinfo.c

Modified: trunk/subversion/libsvn_client/mergeinfo.c
URL: http://svn.collab.net/viewvc/svn/trunk/subversion/libsvn_client/mergeinfo.c?pathrev=28156&r1=28155&r2=28156
 ==============================================================================
--- trunk/subversion/libsvn_client/mergeinfo.c	(original)
+++ trunk/subversion/libsvn_client/mergeinfo.c	Thu Nov 29 14:04:55 2007
@@ -963,14 +963,13 @@
         {
           const void *key;
           void *val;
-          const char *rel_url;
+          const char *source_url;
 
           apr_hash_this(hi, &key, NULL, &val);
-          rel_url = svn_path_uri_encode(key, pool);
-          apr_hash_set(full_path_mergeinfo,
-                       apr_pstrcat(pool, repos_root, rel_url, NULL),
-                       APR_HASH_KEY_STRING,
-                       val);
+          source_url = svn_path_uri_encode(key, pool);
+          source_url = svn_path_join(repos_root, source_url + 1, pool);
+          apr_hash_set(full_path_mergeinfo, source_url, 
+                       APR_HASH_KEY_STRING, val);
         }
       *mergeinfo = full_path_mergeinfo;
     }

---------------------------------------------------------------------
To unsubscribe, e-mail: svn-unsubscribe@subversion.tigris.org
For additional commands, e-mail: svn-help@subversion.tigris.org


[prev in list] [next in list] [prev in thread] [next in thread]