You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@subversion.apache.org by ju...@apache.org on 2011/12/11 18:23:46 UTC

svn commit: r1213025 - /subversion/trunk/subversion/libsvn_client/merge.c

Author: julianfoad
Date: Sun Dec 11 17:23:46 2011
New Revision: 1213025

URL: http://svn.apache.org/viewvc?rev=1213025&view=rev
Log:
Fix a silly bug in r1213018 that made several merge tests fail.

* subversion/libsvn_client/merge.c^M  (merge_locked): Use the right variable.

Modified:
    subversion/trunk/subversion/libsvn_client/merge.c

Modified: subversion/trunk/subversion/libsvn_client/merge.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/merge.c?rev=1213025&r1=1213024&r2=1213025&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/merge.c (original)
+++ subversion/trunk/subversion/libsvn_client/merge.c Sun Dec 11 17:23:46 2011
@@ -9438,7 +9438,7 @@ merge_locked(const char *source1,
     {
       /* Make YC_RELPATH into a full URL. */
       const char *yc_url = svn_path_url_add_component2(source_repos_root.url,
-                                                       yc_url, scratch_pool);
+                                                       yc_relpath, scratch_pool);
 
       /* Note that our merge sources are related. */
       related = TRUE;