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 254816

Summary:	IllegalStateException: Duplicate stages not allowed: 2 nbactions.xml
Product:	versioncontrol	Reporter:	Exceptions Reporter <exceptions_reporter>
Component:	Git	Assignee:	Ondrej Vrabec <ovrabec>
Status:	RESOLVED FIXED
Severity:	normal	CC:	alied, git
Priority:	P3
Version:	8.1
Hardware:	All
OS:	All
Issue Type:	DEFECT	Exception Reporter:	219524
Attachments:	stacktrace

Description Exceptions Reporter 2015-08-28 13:54:12 UTC

This bug was originally marked as duplicate of bug 249665, that is already resolved. This bug is still valid, so this seems to be another bug, but it might be related.

Build: NetBeans IDE 8.1 Beta (Build 201508041349)
VM: Java HotSpot(TM) 64-Bit Server VM, 23.21-b01, Java(TM) SE Runtime Environment, 1.7.0_21-b11
OS: Windows 8

User Comments:
GUEST: Committing via GitHub. Mergeing branches




Stacktrace: 
java.lang.IllegalStateException: Duplicate stages not allowed: 2 nbactions.xml
   at org.eclipse.jgit.dircache.DirCacheBuilder.bad(DirCacheBuilder.java:247)
   at org.eclipse.jgit.dircache.DirCacheBuilder.resort(DirCacheBuilder.java:236)
   at org.eclipse.jgit.dircache.DirCacheBuilder.finish(DirCacheBuilder.java:192)
   at org.eclipse.jgit.dircache.DirCacheCheckout.doCheckout(DirCacheCheckout.java:421)
   at org.eclipse.jgit.dircache.DirCacheCheckout.checkout(DirCacheCheckout.java:396)
   at org.netbeans.libs.git.jgit.commands.CheckoutRevisionCommand.run(CheckoutRevisionCommand.java:153)

Comment 1 Exceptions Reporter 2015-08-28 13:54:14 UTC

Created attachment 155721 [details]
stacktrace

Comment 2 Ondrej Vrabec 2015-09-10 17:14:08 UTC

Find a way to reproduce:
1) create a branch 'A' from master and make a commit to a single file
2) checkout master and make a conflicting change to the same file
3) merge A into master
4) do not resolve conflicts but checkout A
5) you will be asked if you want to review/revert/merge
6) do a merge => BANG

Comment 3 Ondrej Vrabec 2015-09-10 17:36:37 UTC

*** Bug 249665 has been marked as a duplicate of this bug. ***

Comment 4 Ondrej Vrabec 2015-09-10 18:56:04 UTC

fix: http://hg.netbeans.org/core-main/rev/3909c5c51ac9

Comment 5 Quality Engineering 2015-09-12 03:05:48 UTC

Integrated into 'main-silver', will be available in build *201509120002* on http://bits.netbeans.org/dev/nightly/ (upload may still be in progress)

Changeset: http://hg.netbeans.org/main-silver/rev/3909c5c51ac9
User: Ondrej Vrabec <ovrabec@netbeans.org>
Log: #254816 - IllegalStateException: Duplicate stages not allowed: 2 nbactions.xml
Disallow switching branches after an unresolved merge. Do not
offer merge when checking out revision with unresolved local conflicts.