svn commit: r1034019 - /subversion/trunk/subversion/libsvn_wc/upgrade.c

[cm...@apache.org]

Author: cmpilato
Date: Thu Nov 11 18:09:31 2010
New Revision: 1034019

URL: http://svn.apache.org/viewvc?rev=1034019&view=rev
Log:
Fix issue #3580 ("WC-NG upgrade and WC_DB hardcode ".svn") by
dynamically referred to the administrative directory name in the WC-NG
upgrade code.  (Similar problems in the WC_DB code were resoved in
r910234.)

* subversion/libsvn_wc/upgrade.c
  (build_lockfile_path): Dynamically fetch the administrative directory
    name (instead of hard-coding ".svn").  While here, add a docstring.

Modified:
    subversion/trunk/subversion/libsvn_wc/upgrade.c

Modified: subversion/trunk/subversion/libsvn_wc/upgrade.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/upgrade.c?rev=1034019&r1=1034018&r2=1034019&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/upgrade.c (original)
+++ subversion/trunk/subversion/libsvn_wc/upgrade.c Thu Nov 11 18:09:31 2010
@@ -372,14 +372,15 @@ get_versioned_files(const apr_array_head
 }
 
 
-/* */
+/* Return the path of the old-school administrative lock file
+   associated with LOCAL_DIR_ABSPATH, allocated from RESULT_POOL. */
 static const char *
 build_lockfile_path(const char *local_dir_abspath,
                     apr_pool_t *result_pool)
 {
   return svn_dirent_join_many(result_pool,
                               local_dir_abspath,
-                              ".svn", /* ### switch to dynamic?  */
+                              svn_wc_get_adm_dir(result_pool),
                               ADM_LOCK,
                               NULL);
 }