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.

Bug 205961

Summary:	IDE gets confused with different versioning and Projects from existing sources
Product:	versioncontrol	Reporter:	javydreamercsw <javydreamercsw>
Component:	Mercurial	Assignee:	Ondrej Vrabec <ovrabec>
Status:	RESOLVED INVALID
Severity:	normal
Priority:	P1
Version:	7.1
Hardware:	PC
OS:	Windows 7
Issue Type:	DEFECT	Exception Reporter:
Attachments:	Test Case Test Case 2/2

Description javydreamercsw 2011-12-05 19:13:36 UTC

Product Version = NetBeans IDE 7.1 (Build 201112030901)
Operating System = Windows 7 version 6.1 running on x86
Java; VM; Vendor = 1.7.0_01
Runtime = Java HotSpot(TM) Client VM 21.1-b02

To reproduce:
1) Checkout or create a project versioned in Mercurial
2) Within that folder's folder checkout a project versioned in Git.
3) Create a project from the sources checked out on 2 on a different folder within the project in step 1
4) Right click on the project created on step 3. Notice the versioning items are for Mercurial instead of Git.

This might happen with other combinations.

Comment 1 Ondrej Vrabec 2011-12-05 19:42:26 UTC

I am sorry, i don't understand your steps at all. Are you describing the following setup:

ProjectA (in mercurial)
+-- .hg
+-- src-for-A
+-- ProjectB (in git)
    +--.git
    +--src-for-B

and saying that actions in popup menu for ProjectB in the Projects view contains Mercurial actions?
If not, describe the setup in detail or even better: attach a test case.

Comment 2 javydreamercsw 2011-12-05 21:05:57 UTC

Almost right, this is the set up:
Project A (in mercurial)
+-- .hg
+-- src-for-A
+-- Project B (just the NetBeans project)
+-- Project B source
    +--.git

Actions in popup menu for Project B in the Projects view
contains Mercurial actions. I'll try to work on a test case and attach it.

Comment 3 javydreamercsw 2011-12-05 21:17:01 UTC

Created attachment 113842 [details]
Test Case

In this test case no VCS commands are displayed. Maybe because the outer folder is not a real project?

To get the same scenario just checkout a project from mercurial and copy and paste marauroa and Marauroa-Project folders within it.

Comment 4 javydreamercsw 2011-12-05 21:17:25 UTC

Created attachment 113843 [details]
Test Case 2/2

Comment 5 Ondrej Vrabec 2011-12-05 21:41:54 UTC

I see no problem in the way the IDE reacts to your setup.
A project normally consists of several file groups (source groups) that together create the logic project structure. If these groups come from different version control systems then there's obviously no way to tell what version control should be used as the primary one. In your case 'src' and 'libs' (and other sources from marauroa) are versioned with git *meanwhile* the source group 'nbproject' (i.e. project metadata) are versioned with mercurial. BTW, Git actions are available on src or libs folder under the project node, which only illustrates the logic i described: VCS of the project node cannot be unambiguously determined (Mercurial or Git?) while we have enough information to correctly determine Git as their owner.
So please fix your setup and move Marauroa-Project outside of Mercurial controlled space.