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.
Scope of this issue is unamaged project, i.e. project created by project with existing sources or project or project from binary file wizards. Steps to reproduce: - create project. - put project in VCS, i.e. put all files in the folder "nbproject", ignore folder "nbproject/private", folder nbproject has relative path to sources and is located in the same VCS as sources. - work with project (change some source files, build, debug, run, exit from IDE, start IDE). - pull project from VCS on another computer and work with it (change some source files, build, debug, run, exit from IDE, start IDE). Actual behavior: - VCS shows changes in the file nbproject/configurations.xml. Expected behavior: - there is no changes in VCS until user consciously changes nbproject/configurations.xml.
Integrated into 'main-golden', will be available in build *201207170002* on http://bits.netbeans.org/dev/nightly/ (upload may still be in progress) Changeset: http://hg.netbeans.org/main-golden/rev/6f2f7b49c2af User: Alexander Simon <alexvsimon@netbeans.org> Log: fixing Bug #215568 Cannot put unmanaged project in VCS. - separate configurations.xml on parts: 1. move project tree + code assistance properties in private area (nbproject/private/configurations.xml) 2. wizard creates initial unmodifiable project tree + code assistance properties in public area (nbproject/default_configurations.xml)
Fixed: 1. The following section was moved from nbproject/configurations.xml to nbproject/private/configurations.xml: - section with project structure - section with code assistance configuration 2. Wizards of project with existing code and project from binary file create "default configuration". It is a file nbproject/default_configurations.xml. This file is created only once and is not modified by IDE. 3. Folder nbproject/private should be ignored by VCS 4. IDE project pulled from VCS does not have nbproject/private folder. IDE first time opening the project reads nbproject/default_configurations.xml and creates own clone of default configuration in the nbproject/private folder. IDE warns user about using default code assistance configuration. IDE suggest to resolve possible inaccuracy of code assistance by rebuilding project. 5. There is no way to automatically update default configuration. Note: this is actual only for "unmanaged project" (i.e. project with existing code or project from binary file). VCS issues of managed projects are out of the issue scope.
Integrated into 'main-golden', will be available in build *201207201342* on http://bits.netbeans.org/dev/nightly/ (upload may still be in progress) Changeset: http://hg.netbeans.org/main-golden/rev/0988858a1019 User: Alexander Simon <alexvsimon@netbeans.org> Log: fixing Bug #215568 Cannot put unmanaged project in VCS - show resolve references problem dialog if default configurations is loaded
roll back changes: http://hg.netbeans.org/cnd-main/rev/c24f200e0412
increment version: http://hg.netbeans.org/cnd-main/rev/ed0734db695e
thanks, Alexander
Integrated into 'main-golden', will be available in build *201210170002* on http://bits.netbeans.org/dev/nightly/ (upload may still be in progress) Changeset: http://hg.netbeans.org/main-golden/rev/c24f200e0412 User: Alexander Simon <alexvsimon@netbeans.org> Log: roll back fix of Bug #215568 Cannot put unmanaged project in VCS.
revert store logic: store only items with non-excluded configurations (under flag). It can be deserialized with old schema: http://hg.netbeans.org/cnd-main/rev/4437ed163245 http://hg.netbeans.org/cnd-main/rev/a07bddb40f1f
Integrated into 'main-golden', will be available in build *201210260001* on http://bits.netbeans.org/dev/nightly/ (upload may still be in progress) Changeset: http://hg.netbeans.org/main-golden/rev/4437ed163245 User: Vladimir Voskresensky <vv159170@netbeans.org> Log: fixing #215568 - Cannot put unmanaged project in VCS - revert store logic: store only items with non-excluded configurations (under flag). It can be deserialized with old schema number without problems
Integrated into 'main-golden', will be available in build *201210270001* on http://bits.netbeans.org/dev/nightly/ (upload may still be in progress) Changeset: http://hg.netbeans.org/main-golden/rev/ca0f670e89ad User: Vladimir Voskresensky <vv159170@netbeans.org> Log: fixing #215568 - Cannot put unmanaged project in VCS - logical folder and source roots are always writable; items from logical folder are writable as well (we fix the issue with unmanaged projects based on physical structure)
Integrated into 'main-golden', will be available in build *201210300001* on http://bits.netbeans.org/dev/nightly/ (upload may still be in progress) Changeset: http://hg.netbeans.org/main-golden/rev/ece2e895de23 User: Vladimir Voskresensky <vv159170@netbeans.org> Log: fixing #215568 - Cannot put unmanaged project in VCS - for the first version: allow discovery manipulate with headers as before
Integrated into 'main-golden', will be available in build *201210310001* on http://bits.netbeans.org/dev/nightly/ (upload may still be in progress) Changeset: http://hg.netbeans.org/main-golden/rev/2180283bb82f User: Alexander Simon <alexvsimon@netbeans.org> Log: fixing Bug #215568 Cannot put unmanaged project in VCS - introduce env variable and transient macros
Integrated into 'main-golden', will be available in build *201211010001* on http://bits.netbeans.org/dev/nightly/ (upload may still be in progress) Changeset: http://hg.netbeans.org/main-golden/rev/3679ef96eb88 User: Vladimir Voskresensky <vv159170@netbeans.org> Log: fixing #215568 - Cannot put unmanaged project in VCS // in new scheme we restored "non-excluded" items => all new are treated as excluded by default // in old scheme we didn't store "non-excluded" items, we stored "excluded" instead // so to support projects with old scheme we need to consider all new files as "non-excluded"
new scheme is implemented: - keep only attributed items - support env variables to be used as replacements of abs path in "include path" settings - support transient macros to escape system/user dependent macro values
Please, file all other issues as bugs.
Integrated into 'main-golden', will be available in build *201211020001* on http://bits.netbeans.org/dev/nightly/ (upload may still be in progress) Changeset: http://hg.netbeans.org/main-golden/rev/7958586c26ba User: Vladimir Voskresensky <vv159170@netbeans.org> Log: fixed #221231 - all files are switched off from code assistance if "Clean and Build after Finish" checkbox is switched off (after #215568 - Cannot put unmanaged project in VCS) - when init logical folder all files are included into project, later on discovery will update real states
Integrated into 'releases', will be available in build *201211021451* or newer. Wait for official and publicly available build. Changeset: http://hg.netbeans.org/releases/rev/e910c00f2d70 User: Vladimir Voskresensky <vv159170@netbeans.org> Log: fixing #221235 - removed/added folder appears twice in project view (after #215568 - Cannot put unmanaged project in VCS) - before adding new folder search if it is already present (transplanted from 523d0868b28b8339b6e807e885fe67ca5fde4ce2)
Integrated into 'main-golden', will be available in build *201211300001* on http://bits.netbeans.org/dev/nightly/ (upload may still be in progress) Changeset: http://hg.netbeans.org/main-golden/rev/d9df58cd6096 User: Vladimir Voskresensky <vv159170@netbeans.org> Log: clean up for #215568 - Cannot put unmanaged project in VCS. - now new scheme is always used in product
*** Bug 201042 has been marked as a duplicate of this bug. ***
Vladimir, The fix broke move (D&D) functionality. Please fix.
(In reply to Alexander Simon from comment #20) > Vladimir, > > The fix broke move (D&D) functionality. > Please fix. fixed as a part of fix the bug #235459
(In reply to Alexander Simon from comment #21) > (In reply to Alexander Simon from comment #20) > > Vladimir, > > > > The fix broke move (D&D) functionality. > > Please fix. > fixed as a part of fix the bug #235459 Thanks!