diff -r 8e8264dab00b versioning/apichanges.xml
--- a/versioning/apichanges.xml	Fri Jun 20 11:51:01 2008 +0200
+++ b/versioning/apichanges.xml	Fri Jun 20 15:37:09 2008 +0200
@@ -108,6 +108,24 @@
         
         <change>
             <api name="versioning_spi"/>
+            <summary>Added getCollocationQueryImplementation() method to VersioningSystem</summary>
+            <version major="1" minor="8"/>
+            <date day="27" month="6" year="2008"/>
+            <author login="msandor"/>
+            <compatibility addition="yes"/>
+            <description>
+                Every Versioning system should provide a CollocationQueryImplementation. This API change has two purposes:
+                1. It makes it clear and explicit that implementors of a VersioningSystem should provide the query. It would be possible for them
+                to just implement and register their own CollocationQueryImplementation but they could easily forget to do that.
+                2. There will be only one registered CQI (Versioning manager) that will delegate the query to the appropriate
+                versioning system which will speed things up.
+            </description>
+            <class package="org.netbeans.modules.versioning.spi" name="VersioningSystem"/>
+            <issue number="137822"/>
+        </change>
+
+        <change>
+            <api name="versioning_spi"/>
             <summary>Added isMutable() method to VCSInterceptor</summary>
             <version major="1" minor="7"/>
             <date day="30" month="3" year="2008"/>
diff -r 8e8264dab00b versioning/src/org/netbeans/modules/versioning/spi/VersioningSystem.java
--- a/versioning/src/org/netbeans/modules/versioning/spi/VersioningSystem.java	Fri Jun 20 11:51:01 2008 +0200
+++ b/versioning/src/org/netbeans/modules/versioning/spi/VersioningSystem.java	Fri Jun 20 15:37:09 2008 +0200
@@ -41,6 +41,7 @@
 package org.netbeans.modules.versioning.spi;
 
 import org.netbeans.modules.versioning.VersioningManager;
+import org.netbeans.spi.queries.CollocationQueryImplementation;
 
 import java.io.File;
 import java.beans.PropertyChangeListener;
@@ -171,6 +172,16 @@
     }
 
     /**
+     * Retrieves a CollocationQueryImplementation if this versioning system provides one.
+     * 
+     * @return CollocationQueryImplementation a CollocationQueryImplementation instance or null if the system does not provide the service
+     * @since 1.8
+     */
+    public CollocationQueryImplementation getCollocationQueryImplementation() {
+        return null;
+    }    
+
+    /**
      * Adds a listener for change events.
      * 
      * @param listener a PropertyChangeListener