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.
Build: NetBeans IDE 7.2 (Build 201207171143) VM: Java HotSpot(TM) 64-Bit Server VM, 20.8-b03-424, Java(TM) SE Runtime Environment, 1.6.0_33-b03-424-11E53 OS: Mac OS X User Comments: danielfornies: subversion -> merge changes.... and exception occurred Stacktrace: java.lang.IllegalArgumentException: Unknown conflict action: replaced at org.tmatesoft.svn.core.javahl17.SVNClientImpl.getConflictDescriptorAction(SVNClientImpl.java:2415) at org.tmatesoft.svn.core.javahl17.SVNClientImpl.getConflictDescription(SVNClientImpl.java:2351) at org.tmatesoft.svn.core.javahl17.SVNClientImpl.getConflictDescriptors(SVNClientImpl.java:2216) at org.tmatesoft.svn.core.javahl17.SVNClientImpl.getInfo(SVNClientImpl.java:2188) at org.tmatesoft.svn.core.javahl17.SVNClientImpl.access$1000(SVNClientImpl.java:159) at org.tmatesoft.svn.core.javahl17.SVNClientImpl$11.receive(SVNClientImpl.java:2174)
Created attachment 122398 [details] stacktrace
already filed to svnkit: http://issues.tmatesoft.com/issue/SVNKIT-260
This bug already has 5 duplicates see http://statistics.netbeans.org/exceptions/detail.do?id=190500
svnkit bug fixed and svnkit upgraded in NB codebase
*** Bug 217090 has been marked as a duplicate of this bug. ***
*** Bug 217576 has been marked as a duplicate of this bug. ***
*** Bug 217365 has been marked as a duplicate of this bug. ***