This Bugzilla instance is a read-only archive of historic NetBeans bug reports. To report a bug in NetBeans please follow the project's instructions for reporting issues.
After issue #33693 was implemented, the profiles for every VCS type, that are defined for several operating systems can be merged into a single profile and use conditions to distinguish among various operating systems.
Fixed for CVS profile: Checking in Bundle.properties; /cvs/vcsgeneric/profiles/cvsprofiles/src/org/netbeans/modules/vcs/profiles/cvsprofiles/config/Bundle.properties,v <-- Bundle.properties new revision: 1.14.2.4; previous revision: 1.14.2.3 done RCS file: /cvs/vcsgeneric/profiles/cvsprofiles/src/org/netbeans/modules/vcs/profiles/cvsprofiles/config/Attic/cvs.xml,v done Checking in cvs.xml; /cvs/vcsgeneric/profiles/cvsprofiles/src/org/netbeans/modules/vcs/profiles/cvsprofiles/config/Attic/cvs.xml,v <-- cvs.xml new revision: 1.1.2.1; previous revision: 1.1 done Removing cvsUnix.xml; /cvs/vcsgeneric/profiles/cvsprofiles/src/org/netbeans/modules/vcs/profiles/cvsprofiles/config/cvsUnix.xml,v <-- cvsUnix.xml new revision: delete; previous revision: 1.25.2.3 done Removing cvsWin.xml; /cvs/vcsgeneric/profiles/cvsprofiles/src/org/netbeans/modules/vcs/profiles/cvsprofiles/config/cvsWin.xml,v <-- cvsWin.xml new revision: delete; previous revision: 1.27.2.3 done Removing cvsWin98.xml; /cvs/vcsgeneric/profiles/cvsprofiles/src/org/netbeans/modules/vcs/profiles/cvsprofiles/config/cvsWin98.xml,v <-- cvsWin98.xml new revision: delete; previous revision: 1.26.2.3 done
Fixed for PVCS profile: Checking in Bundle.properties; /cvs/vcsgeneric/profiles/pvcs/src/org/netbeans/modules/vcs/profiles/pvcs/config/Bundle.properties,v <-- Bundle.properties new revision: 1.8.32.1; previous revision: 1.8 done RCS file: /cvs/vcsgeneric/profiles/pvcs/src/org/netbeans/modules/vcs/profiles/pvcs/config/Attic/pvcs.xml,v done Checking in pvcs.xml; /cvs/vcsgeneric/profiles/pvcs/src/org/netbeans/modules/vcs/profiles/pvcs/config/Attic/pvcs.xml,v <-- pvcs.xml new revision: 1.1.2.1; previous revision: 1.1 done RCS file: /cvs/vcsgeneric/profiles/pvcs/src/org/netbeans/modules/vcs/profiles/pvcs/config/Attic/pvcsLoc_XX.xml,v done Checking in pvcsLoc_XX.xml; /cvs/vcsgeneric/profiles/pvcs/src/org/netbeans/modules/vcs/profiles/pvcs/config/Attic/pvcsLoc_XX.xml,v <-- pvcsLoc_XX.xml new revision: 1.1.2.1; previous revision: 1.1 done Removing pvcsUnix.xml; /cvs/vcsgeneric/profiles/pvcs/src/org/netbeans/modules/vcs/profiles/pvcs/config/pvcsUnix.xml,v <-- pvcsUnix.xml new revision: delete; previous revision: 1.36.6.1 done Removing pvcsUnixLoc_XX.xml; /cvs/vcsgeneric/profiles/pvcs/src/org/netbeans/modules/vcs/profiles/pvcs/config/pvcsUnixLoc_XX.xml,v <-- pvcsUnixLoc_XX.xml new revision: delete; previous revision: 1.37.6.1 done Removing pvcsWin.xml; /cvs/vcsgeneric/profiles/pvcs/src/org/netbeans/modules/vcs/profiles/pvcs/config/pvcsWin.xml,v <-- pvcsWin.xml new revision: delete; previous revision: 1.43.6.1 done Removing pvcsWin98.xml; /cvs/vcsgeneric/profiles/pvcs/src/org/netbeans/modules/vcs/profiles/pvcs/config/pvcsWin98.xml,v <-- pvcsWin98.xml new revision: delete; previous revision: 1.40.6.1 done Removing pvcsWin98Loc_XX.xml; /cvs/vcsgeneric/profiles/pvcs/src/org/netbeans/modules/vcs/profiles/pvcs/config/pvcsWin98Loc_XX.xml,v <-- pvcsWin98Loc_XX.xml new revision: delete; previous revision: 1.40.6.1 done Removing pvcsWinLoc_XX.xml; /cvs/vcsgeneric/profiles/pvcs/src/org/netbeans/modules/vcs/profiles/pvcs/config/pvcsWinLoc_XX.xml,v <-- pvcsWinLoc_XX.xml new revision: delete; previous revision: 1.43.6.1 done
Fixed for VSS profile: Checking in Bundle.properties; /cvs/vcsgeneric/profiles/vss/src/org/netbeans/modules/vcs/profiles/vss/config/Bundle.properties,v <-- Bundle.properties new revision: 1.3.72.1; previous revision: 1.3 done RCS file: /cvs/vcsgeneric/profiles/vss/src/org/netbeans/modules/vcs/profiles/vss/config/Attic/vss.xml,v done Checking in vss.xml; /cvs/vcsgeneric/profiles/vss/src/org/netbeans/modules/vcs/profiles/vss/config/Attic/vss.xml,v <-- vss.xml new revision: 1.1.2.1; previous revision: 1.1 done RCS file: /cvs/vcsgeneric/profiles/vss/src/org/netbeans/modules/vcs/profiles/vss/config/Attic/vssLoc_XX.xml,v done Checking in vssLoc_XX.xml; /cvs/vcsgeneric/profiles/vss/src/org/netbeans/modules/vcs/profiles/vss/config/Attic/vssLoc_XX.xml,v <-- vssLoc_XX.xml new revision: 1.1.2.1; previous revision: 1.1 done Removing vssWin.xml; /cvs/vcsgeneric/profiles/vss/src/org/netbeans/modules/vcs/profiles/vss/config/vssWin.xml,v <-- vssWin.xml new revision: delete; previous revision: 1.14.20 done Removing vssWin98.xml; /cvs/vcsgeneric/profiles/vss/src/org/netbeans/modules/vcs/profiles/vss/config/vssWin98.xml,v <-- vssWin98.xml new revision: delete; previous revision: 1.14.20 done Removing vssWin98Loc_XX.xml; /cvs/vcsgeneric/profiles/vss/src/org/netbeans/modules/vcs/profiles/vss/config/vssWin98Loc_XX.xml,v <-- vssWin98Loc_XX.xml new revision: delete; previous revision: 1.14.20 done Removing vssWinLoc_XX.xml; /cvs/vcsgeneric/profiles/vss/src/org/netbeans/modules/vcs/profiles/vss/config/vssWinLoc_XX.xml,v <-- vssWinLoc_XX.xml new revision: delete; previous revision: 1.14.20 done And Empty profile: Checking in Bundle.properties; /cvs/vcsgeneric/src/org/netbeans/modules/vcs/profiles/config/Bundle.properties,v <-- Bundle.properties new revision: 1.1.10.2; previous revision: 1.1.10.1 done RCS file: /cvs/vcsgeneric/src/org/netbeans/modules/vcs/profiles/config/Attic/empty.xml,v done Checking in empty.xml; /cvs/vcsgeneric/src/org/netbeans/modules/vcs/profiles/config/Attic/empty.xml,v <-- empty.xml new revision: 1.1.2.1; previous revision: 1.1 done Removing emptyUnix.xml; /cvs/vcsgeneric/src/org/netbeans/modules/vcs/profiles/config/emptyUnix.xml,v <-- emptyUnix.xml new revision: delete; previous revision: 1.2.60.1 done Removing emptyWin.xml; /cvs/vcsgeneric/src/org/netbeans/modules/vcs/profiles/config/emptyWin.xml,v <-- emptyWin.xml new revision: delete; previous revision: 1.2.10.1 done
Fixed for ClearCase profile: Checking in Bundle.properties; /cvs/vcsgeneric/profiles/clearcase/src/org/netbeans/modules/vcs/profiles/clearcase/config/Bundle.properties,v <-- Bundle.properties new revision: 1.4.12.1; previous revision: 1.4 done Checking in ClearCase.xml; /cvs/vcsgeneric/profiles/clearcase/src/org/netbeans/modules/vcs/profiles/clearcase/config/Attic/ClearCase.xml,v <-- ClearCase.xml new revision: 1.7.4.1; previous revision: 1.7 done Removing ClearCase_unix.xml; /cvs/vcsgeneric/profiles/clearcase/src/org/netbeans/modules/vcs/profiles/clearcase/config/ClearCase_unix.xml,v <-- ClearCase_unix.xml new revision: delete; previous revision: 1.10.12 done Removing ClearCase_win32.xml; /cvs/vcsgeneric/profiles/clearcase/src/org/netbeans/modules/vcs/profiles/clearcase/config/ClearCase_win32.xml,v <-- ClearCase_win32.xml new revision: delete; previous revision: 1.10.12 done
And finally fixed for StarTeam profile as well: Checking in list/Stcmd40ListCommand.java; /cvs/vcsgeneric/profiles/starteam/src/org/netbeans/modules/vcs/profiles/starteam/list/Stcmd40ListCommand.java,v <-- Stcmd40ListCommand.java new revision: 1.1.68.1; previous revision: 1.1 done Processing log script arguments... More commits to come... RCS file: /cvs/vcsgeneric/profiles/starteam/src/org/netbeans/modules/vcs/profiles/starteam/config/Attic/st40.xml,v done Checking in config/st40.xml; /cvs/vcsgeneric/profiles/starteam/src/org/netbeans/modules/vcs/profiles/starteam/config/Attic/st40.xml,v <-- st40.xml new revision: 1.1.2.1; previous revision: 1.1 done Removing config/st40unix.xml; /cvs/vcsgeneric/profiles/starteam/src/org/netbeans/modules/vcs/profiles/starteam/config/st40unix.xml,v <-- st40unix.xml new revision: delete; previous revision: 1.1.68 done Removing config/st40win.xml; /cvs/vcsgeneric/profiles/starteam/src/org/netbeans/modules/vcs/profiles/starteam/config/st40win.xml,v <-- st40win.xml new revision: delete; previous revision: 1.2.66 done All profiles are transferred => resolving as fixed.
Martin, I wanted to verify on the NBdev40 #2003-07-11-0100 but CVS Mounter doesn't seem to me it merge profiles together... Thus I reopening it or tell me how I gould verify it that your fix is true (I mean not from looking into the code)
Oh, I didn't write it here. This issue is fixed only in projects builds. I do not implement features in dev builds until projects branch is merged into the main trunk. Adding PROJECTS keyword, since this is implemented only in projects branch.
Well, from looking into TRUNK build and PROJ build I was able verify: cvs-profile empy profile (in vcsgeneric.jar) pvcs-profile vss-profile and from looking into sources I verified the rest: StarTeam-profile ClearCase-profile So I could pronaunce that in project's branche (PRJ40_PROJ) profiles are merged, so thus verifying:-)