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 206530 - IllegalStateException: Merged
Summary: IllegalStateException: Merged
Status: VERIFIED FIXED
Alias: None
Product: versioncontrol
Classification: Unclassified
Component: Git (show other bugs)
Version: 7.1
Hardware: All All
: P3 normal (vote)
Assignee: Ondrej Vrabec
URL:
Keywords:
: 207062 (view as bug list)
Depends on:
Blocks:
 
Reported: 2011-12-19 12:13 UTC by Exceptions Reporter
Modified: 2012-02-29 12:06 UTC (History)
3 users (show)

See Also:
Issue Type: DEFECT
Exception Reporter: 181697

Attachments
stacktrace (3.17 KB, text/plain)
2011-12-19 12:13 UTC, Exceptions Reporter 		Details
Add an attachment (proposed patch, testcase, etc.)

Note You need to log in before you can comment on or make changes to this bug.
Description Exceptions Reporter 2011-12-19 12:13:01 UTC 
Build: NetBeans IDE 7.1 RC2 (Build 201111302200)
VM: Java HotSpot(TM) 64-Bit Server VM, 16.3-b01, Java(TM) SE Runtime Environment, 1.6.0_20-b02
OS: Linux

User Comments:
cpholt: opening ide.  had about 19 projects that were initializing.

GUEST: git




Stacktrace: 
java.lang.IllegalStateException: Merged
   at org.netbeans.libs.git.jgit.JGitClient.getRepositoryState(JGitClient.java:378)
   at sun.reflect.NativeMethodAccessorImpl.invoke0(NativeMethodAccessorImpl.java:0)
   at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:39)
   at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:25)
   at java.lang.reflect.Method.invoke(Method.java:597)
   at org.netbeans.modules.git.client.GitClientInvocationHandler.invokeClientMethod(GitClientInvocationHandler.java:280)
Comment 1 Exceptions Reporter 2011-12-19 12:13:05 UTC 
Created attachment 114295 [details]
stacktrace
Comment 2 Ondrej Vrabec 2011-12-27 17:02:27 UTC 
fix: http://hg.netbeans.org/core-main/rev/0b9a4853cf44
Comment 3 Quality Engineering 2011-12-28 15:46:16 UTC 
Integrated into 'main-golden'
Changeset: http://hg.netbeans.org/main-golden/rev/0b9a4853cf44
User: Ondrej Vrabec <ovrabec@netbeans.org>
Log: #206530 - IllegalStateException: Merged
Comment 4 Ondrej Vrabec 2012-01-09 14:59:48 UTC 
*** Bug 207062 has been marked as a duplicate of this bug. ***
Comment 5 Stepan Zebra 2012-02-09 14:00:59 UTC 
verified in trunk
Comment 6 Ondrej Vrabec 2012-02-10 10:23:26 UTC 
http://hg.netbeans.org/releases/rev/55412311c030
Comment 7 Quality Engineering 2012-02-11 02:53:18 UTC 
Integrated into 'releases', will be available in build *201202102200* or newer. Wait for official and publicly available build.
Changeset: http://hg.netbeans.org/releases/rev/55412311c030
User: Ondrej Vrabec <ovrabec@netbeans.org>
Log: #206530 - IllegalStateException: Merged
Comment 8 Stepan Zebra 2012-02-29 12:06:09 UTC 
verified in 7.1.1