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 215995 - IllegalArgumentException: Unknown conflict action: replaced
Summary: IllegalArgumentException: Unknown conflict action: replaced
Status: RESOLVED WORKSFORME
Alias: None
Product: versioncontrol
Classification: Unclassified
Component: Subversion (show other bugs)
Version: 7.2
Hardware: All All
: P3 normal (vote)
Assignee: Ondrej Vrabec
URL: http://issues.tmatesoft.com/issue/SVN...
Keywords:
: 217090 217365 217576 (view as bug list)
Depends on:
Blocks: 215016
  Show dependency tree
 
Reported: 2012-07-26 10:22 UTC by danielfornies
Modified: 2012-08-30 16:03 UTC (History)
4 users (show)

See Also:
Issue Type: DEFECT
Exception Reporter: 190500


Attachments
stacktrace (6.90 KB, text/plain)
2012-07-26 10:22 UTC, danielfornies
Details

Note You need to log in before you can comment on or make changes to this bug.
Description danielfornies 2012-07-26 10:22:11 UTC
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)
Comment 1 danielfornies 2012-07-26 10:22:14 UTC
Created attachment 122398 [details]
stacktrace
Comment 2 Ondrej Vrabec 2012-07-27 06:15:55 UTC
already filed to svnkit: http://issues.tmatesoft.com/issue/SVNKIT-260
Comment 3 Exceptions Reporter 2012-08-04 05:57:46 UTC
This bug already has 5 duplicates 
see http://statistics.netbeans.org/exceptions/detail.do?id=190500
Comment 4 Ondrej Vrabec 2012-08-23 19:41:26 UTC
svnkit bug fixed and svnkit upgraded in NB codebase
Comment 5 Ondrej Vrabec 2012-08-23 19:41:34 UTC
*** Bug 217090 has been marked as a duplicate of this bug. ***
Comment 6 Ondrej Vrabec 2012-08-30 15:59:40 UTC
*** Bug 217576 has been marked as a duplicate of this bug. ***
Comment 7 Ondrej Vrabec 2012-08-30 16:03:10 UTC
*** Bug 217365 has been marked as a duplicate of this bug. ***