Index: subversion/libsvn_wc/lock.c
===================================================================
--- subversion/libsvn_wc/lock.c	(revision 16692)
+++ subversion/libsvn_wc/lock.c	(working copy)
@@ -256,7 +256,7 @@
 {
   svn_node_kind_t kind;
 
-  SVN_ERR (svn_io_check_path (path, &kind, pool));
+  SVN_ERR (svn_io_check_resolved_path (path, &kind, pool));
   if (kind == svn_node_dir)
     SVN_ERR (svn_wc_check_wc (path, wc_format, pool));
   else
Index: subversion/libsvn_wc/questions.c
===================================================================
--- subversion/libsvn_wc/questions.c	(revision 16692)
+++ subversion/libsvn_wc/questions.c	(working copy)
@@ -54,7 +54,7 @@
   svn_error_t *err = SVN_NO_ERROR;
   svn_node_kind_t kind;
 
-  SVN_ERR (svn_io_check_path (path, &kind, pool));
+  SVN_ERR (svn_io_check_resolved_path (path, &kind, pool));
   
   if (kind == svn_node_none)
     {
Index: subversion/tests/clients/cmdline/special_tests.py
===================================================================
--- subversion/tests/clients/cmdline/special_tests.py	(revision 16692)
+++ subversion/tests/clients/cmdline/special_tests.py	(working copy)
@@ -355,6 +355,33 @@
                                         None, None, None, None, wc_dir)
   
 
+def info_on_symlink(sbox):
+  "info and status on wc symlink"
+
+  sbox.build()
+  wc_dir = sbox.wc_dir
+
+  wc_dir_symlnk = wc_dir + "_symlnk"
+
+  # Cleaning up existing working copy symlink.
+  if os.path.islink(wc_dir_symlnk):
+    os.remove (wc_dir_symlnk)
+
+  # Create a new symlink to existing working copy.
+  os.symlink(os.path.basename(wc_dir), wc_dir_symlnk)
+
+  # Running 'svn info' on working copy symlink.
+  output, err = svntest.actions.run_and_verify_svn(None, None, [], 'info',
+                                                   wc_dir_symlnk)
+  for line in output:
+    print line
+    if line.find("Path: " + wc_dir_symlnk) != -1:
+      repos_lock_token = line[28:]
+      break
+  else:
+    print "Error: Info on wc symlink failed"
+    raise svntest.Failure
+
 ########################################################################
 # Run the tests
 
@@ -367,6 +394,7 @@
               Skip(copy_tree_with_symlink, (os.name != 'posix')),
               Skip(replace_symlink_with_file, (os.name != 'posix')),
               Skip(remove_symlink, (os.name != 'posix')),
+              Skip(info_on_symlink, (os.name != 'posix')),
              ]
 
 if __name__ == '__main__':