vita@veech-laptop:~/devel/netbeans/dev$ cvs commit -m "cvs up -j editor_settings_90403_base_4 -j editor_settings_90403_delivery_3; merging editor's implementation of java.util.prefs.Preferences, see #59458" editor 
Checking in editor/codetemplates/src/org/netbeans/lib/editor/codetemplates/storage/CodeTemplatesStorage.java;
/cvs/editor/codetemplates/src/org/netbeans/lib/editor/codetemplates/storage/CodeTemplatesStorage.java,v  <--  CodeTemplatesStorage.java
new revision: 1.3; previous revision: 1.2
done
Checking in editor/lib/src/org/netbeans/editor/Settings.java;
/cvs/editor/lib/src/org/netbeans/editor/Settings.java,v  <--  Settings.java
new revision: 1.3; previous revision: 1.2
done
Checking in editor/lib/test/unit/src/org/netbeans/editor/SettingsTest.java;
/cvs/editor/lib/test/unit/src/org/netbeans/editor/SettingsTest.java,v  <--  SettingsTest.java
new revision: 1.7; previous revision: 1.6
done
Checking in editor/lib/test/unit/src/org/netbeans/editor/preferences.xml;
/cvs/editor/lib/test/unit/src/org/netbeans/editor/preferences.xml,v  <--  preferences.xml
new revision: 1.2; previous revision: 1.1
done
Checking in editor/lib/test/unit/src/org/netbeans/editor/test-layer.xml;
/cvs/editor/lib/test/unit/src/org/netbeans/editor/test-layer.xml,v  <--  test-layer.xml
new revision: 1.4; previous revision: 1.3
done
Checking in editor/macros/src/org/netbeans/modules/editor/macros/storage/MacrosStorage.java;
/cvs/editor/macros/src/org/netbeans/modules/editor/macros/storage/MacrosStorage.java,v  <--  MacrosStorage.java
new revision: 1.3; previous revision: 1.2
done
Checking in editor/settings/branch-info.txt;
/cvs/editor/settings/branch-info.txt,v  <--  branch-info.txt
new revision: 1.4; previous revision: 1.3
done
Checking in editor/settings/storage/src/META-INF/services/org.netbeans.modules.editor.settings.storage.spi.StorageDescription;
/cvs/editor/settings/storage/src/META-INF/services/org.netbeans.modules.editor.settings.storage.spi.StorageDescription,v  <--  org.netbeans.modules.editor.settings.storage.spi.StorageDescription
new revision: 1.3; previous revision: 1.2
done
Checking in editor/settings/storage/src/org/netbeans/modules/editor/settings/storage/SettingsProvider.java;
/cvs/editor/settings/storage/src/org/netbeans/modules/editor/settings/storage/SettingsProvider.java,v  <--  SettingsProvider.java
new revision: 1.14; previous revision: 1.13
done
Checking in editor/settings/storage/src/org/netbeans/modules/editor/settings/storage/layer.xml;
/cvs/editor/settings/storage/src/org/netbeans/modules/editor/settings/storage/layer.xml,v  <--  layer.xml
new revision: 1.8; previous revision: 1.7
done
Checking in editor/settings/storage/src/org/netbeans/modules/editor/settings/storage/mime-resolvers.xml;
/cvs/editor/settings/storage/src/org/netbeans/modules/editor/settings/storage/mime-resolvers.xml,v  <--  mime-resolvers.xml
new revision: 1.7; previous revision: 1.6
done
Checking in editor/settings/storage/src/org/netbeans/modules/editor/settings/storage/preferences/EditorPreferences-1_0.dtd;
/cvs/editor/settings/storage/src/org/netbeans/modules/editor/settings/storage/preferences/EditorPreferences-1_0.dtd,v  <--  EditorPreferences-1_0.dtd
new revision: 1.2; previous revision: 1.1
done
Checking in editor/settings/storage/src/org/netbeans/modules/editor/settings/storage/preferences/PreferencesImpl.java;
/cvs/editor/settings/storage/src/org/netbeans/modules/editor/settings/storage/preferences/PreferencesImpl.java,v  <--  PreferencesImpl.java
new revision: 1.2; previous revision: 1.1
done
Checking in editor/settings/storage/src/org/netbeans/modules/editor/settings/storage/preferences/PreferencesStorage.java;
/cvs/editor/settings/storage/src/org/netbeans/modules/editor/settings/storage/preferences/PreferencesStorage.java,v  <--  PreferencesStorage.java
new revision: 1.2; previous revision: 1.1
done
Checking in editor/settings/storage/test/unit/src/org/netbeans/modules/editor/settings/storage/preferences/Bundle.properties;
/cvs/editor/settings/storage/test/unit/src/org/netbeans/modules/editor/settings/storage/preferences/Bundle.properties,v  <--  Bundle.properties
new revision: 1.2; previous revision: 1.1
done
Checking in editor/settings/storage/test/unit/src/org/netbeans/modules/editor/settings/storage/preferences/PreferencesStorageTest.java;
/cvs/editor/settings/storage/test/unit/src/org/netbeans/modules/editor/settings/storage/preferences/PreferencesStorageTest.java,v  <--  PreferencesStorageTest.java
new revision: 1.2; previous revision: 1.1
done
Checking in editor/settings/storage/test/unit/src/org/netbeans/modules/editor/settings/storage/preferences/PreferencesTest.java;
/cvs/editor/settings/storage/test/unit/src/org/netbeans/modules/editor/settings/storage/preferences/PreferencesTest.java,v  <--  PreferencesTest.java
new revision: 1.2; previous revision: 1.1
done
Checking in editor/settings/storage/test/unit/src/org/netbeans/modules/editor/settings/storage/preferences/preferences-all-languages.xml;
/cvs/editor/settings/storage/test/unit/src/org/netbeans/modules/editor/settings/storage/preferences/preferences-all-languages.xml,v  <--  preferences-all-languages.xml
new revision: 1.2; previous revision: 1.1
done
Checking in editor/settings/storage/test/unit/src/org/netbeans/modules/editor/settings/storage/preferences/preferences-testA-1.xml;
/cvs/editor/settings/storage/test/unit/src/org/netbeans/modules/editor/settings/storage/preferences/preferences-testA-1.xml,v  <--  preferences-testA-1.xml
new revision: 1.2; previous revision: 1.1
done
Checking in editor/settings/storage/test/unit/src/org/netbeans/modules/editor/settings/storage/preferences/preferences-testA-2.xml;
/cvs/editor/settings/storage/test/unit/src/org/netbeans/modules/editor/settings/storage/preferences/preferences-testA-2.xml,v  <--  preferences-testA-2.xml
new revision: 1.2; previous revision: 1.1
done
Checking in editor/settings/storage/test/unit/src/org/netbeans/modules/editor/settings/storage/preferences/test-layer-PreferencesStorageTest.xml;
/cvs/editor/settings/storage/test/unit/src/org/netbeans/modules/editor/settings/storage/preferences/test-layer-PreferencesStorageTest.xml,v  <--  test-layer-PreferencesStorageTest.xml
new revision: 1.2; previous revision: 1.1
done
Checking in editor/src/org/netbeans/modules/editor/options/BaseOptions.java;
/cvs/editor/src/org/netbeans/modules/editor/options/BaseOptions.java,v  <--  BaseOptions.java
new revision: 1.160; previous revision: 1.159
done
Checking in editor/src/org/netbeans/modules/editor/options/OptionSupport.java;
/cvs/editor/src/org/netbeans/modules/editor/options/OptionSupport.java,v  <--  OptionSupport.java
new revision: 1.38; previous revision: 1.37
done
Checking in editor/src/org/netbeans/modules/editor/options/PropertiesMIMEOptionFile.java;
/cvs/editor/src/org/netbeans/modules/editor/options/PropertiesMIMEOptionFile.java,v  <--  PropertiesMIMEOptionFile.java
new revision: 1.11; previous revision: 1.10
done
Checking in editor/src/org/netbeans/modules/editor/options/PropertiesMIMEProcessor.java;
/cvs/editor/src/org/netbeans/modules/editor/options/PropertiesMIMEProcessor.java,v  <--  PropertiesMIMEProcessor.java
new revision: 1.6; previous revision: 1.5
done
Checking in editor/test/unit/src/org/netbeans/modules/editor/openide/InheritedNotifyModifiedTest.java;
/cvs/editor/test/unit/src/org/netbeans/modules/editor/openide/InheritedNotifyModifiedTest.java,v  <--  InheritedNotifyModifiedTest.java
new revision: 1.7; previous revision: 1.6
done