Index: VcsFileSystem.java
===================================================================
RCS file: /cvs/vcscore/src/org/netbeans/modules/vcscore/VcsFileSystem.java,v
retrieving revision 1.324
retrieving revision 1.325
diff -u -r1.324 -r1.325
--- VcsFileSystem.java	31 Mar 2005 17:10:07 -0000	1.324
+++ VcsFileSystem.java	8 Apr 2005 12:50:49 -0000	1.325
@@ -3930,8 +3930,10 @@
         if (isCallEditFilesOn()) {
             if (!file.canWrite ()) {
                 FileObject fo = findResource(name);
-                FileProperties fprops = Turbo.getCachedMeta(fo);
-                if (fprops != null && !fprops.isLocal () && !name.endsWith (".orig")) { // NOI18N
+                // Get really cached attribute in any case (from memory or disk layer).
+                FileProperties fprops = (FileProperties) FileAttributeQuery.getDefault().readAttribute(fo, FileProperties.ID);
+                boolean local = (fprops != null) ? fprops.isLocal() : false;
+                if (!local && !name.endsWith (".orig")) { // NOI18N
                     if (isPromptForEditOn()) {
                         VcsConfigVariable msgVar = (VcsConfigVariable) variablesByName.get(Variables.MSG_PROMPT_FOR_AUTO_EDIT);
                         String message;
@@ -3946,7 +3948,8 @@
         }
         if (isLockFilesOn()) {
             FileObject fo = findResource(name);
-            FileProperties fprops = Turbo.getCachedMeta(fo);
+            // Get really cached attribute in any case (from memory or disk layer).
+            FileProperties fprops = (FileProperties) FileAttributeQuery.getDefault().readAttribute(fo, FileProperties.ID);
             boolean local = fprops != null ? fprops.isLocal() : false;
             // *.orig is a temporary file created by AbstractFileObject
             // on saving every file to enable undo if saving fails
@@ -4105,8 +4108,10 @@
         if(isLockFilesOn ()) {
             FileObject fo = findResource(name);
             assert fo != null : "No resource for '"+name+"'"; // NOI18N
-            FileProperties fprops = Turbo.getCachedMeta(fo);
-            if (fprops != null && !fprops.isLocal () && !name.endsWith (".orig")) { // NOI18N
+            // Get really cached attribute in any case (from memory or disk layer).
+            FileProperties fprops = (FileProperties) FileAttributeQuery.getDefault().readAttribute(fo, FileProperties.ID);
+            boolean local = (fprops != null) ? fprops.isLocal() : false;
+            if (!local && !name.endsWith (".orig")) { // NOI18N
                 Command command = createCommand("UNLOCK", name, null);
                 if (command != null) {
                     boolean customized = VcsManager.getDefault().showCustomizer(command);