diff --git a/tool/vcs.rb b/tool/vcs.rb
index 9f7c3a5ea7..1f4f5ff0e0 100644
--- a/tool/vcs.rb
+++ b/tool/vcs.rb
@@ -161,7 +161,13 @@ class VCS
         info = get_info
         @wcroot = info[/<wcroot-abspath>(.*)<\/wcroot-abspath>/, 1]
         unless @wcroot
-          STDERR.puts info.gsub(/^/, 'SVNINFO: ')
+          parent = File.realpath(@srcdir)
+          begin
+            parent = File.dirname(wkdir = parent)
+            if File.directory?(wkdir + "/.svn")
+              break @wcroot = wkdir
+            end
+          end until parent == wkdir
         end
       end
       @wcroot