Product: Aqua Data Studio
Version: 18.0.0-preview-81
Build #: 53287
Build Date: 2017-Feb-20 02:11:09 PM
Operating Environment: Linux (4.4.0-62-generic, amd64) / UTF-8 / en / IN / Oracle Corporation 1.8.0_102-b14
Memory: Max=704,643,072; Total=527,433,728; Free=354,243,232; CPUs=8
Steps to reproduce:
-
Launch ADS v18.0.0-preview-81
-
Go to files tab on schema browser > Right click on 'Filesystem' tree node > Select 'Mount Directory'.
-
Create a new folder and select this newly created folder from 'Select directory' window.
-
Right click on newly added tree node > Version control > Subversion > Checkout. [Configure Version control window opened].
-
Enter valid credentials under 'Repository URL', 'Username' and 'Password' > Click on OK.
-
Right click on the tree node > Version Control > Show History > 'History' window is opened.
-
Right click on any revision number > Select 'Revert changes from revision #number' > Click 'OK' on revert changes window.
-
Observe red exclamation mark is displayed in front of reverted file in tree node > Commit that file
Actual Result: 'org.tmatesoft.svn.core.SVNException' is thrown in view log on committing a file whose changes are reverted from a svn revision.
Expected Result: Reverted file from a svn revision should be committed successfully.
Observations:
-
This issue is observed on all three OS.
-
This issue is also observed in ADS v17.
Stack trace for 'org.tmatesoft.svn.core.SVNException':
org.tmatesoft.svn.core.SVNException: svn: E155015: Commit failed (details follow):
svn: E155015: Aborting commit: '/home/vaibhav/Desktop/svncheckout/branches/feature' remains in tree-conflict
at org.tmatesoft.svn.core.internal.wc.SVNErrorManager.error(SVNErrorManager.java:64)
at org.tmatesoft.svn.core.internal.wc.SVNErrorManager.error(SVNErrorManager.java:51)
at org.tmatesoft.svn.core.internal.wc2.ng.SvnNgCommit.collectCommitItems(SvnNgCommit.java:101)
at org.tmatesoft.svn.core.wc2.SvnOperationFactory.collectCommitItems(SvnOperationFactory.java:1833)
at org.tmatesoft.svn.core.wc2.SvnCommit.collectCommitItems(SvnCommit.java:178)
at org.tmatesoft.svn.core.wc.SVNCommitClient.doCollectCommitItems(SVNCommitClient.java:1182)
at org.tmatesoft.svn.core.wc.SVNCommitClient.doCollectCommitItems(SVNCommitClient.java:1029)
at \\.\\.\\हिñçêČάй語简�?한\\.Sꀐᛌ̳ꃬpublicdouble.a(Unknown Source)
at \\.\\.\\हिñçêČάй語简�?한\\.yꏸꑅ⢁̽package.a(Unknown Source)
at \\.\\.\\हिñçêČάй語简�?한\\.A⣬ꉪꑊꑸfinally.run(Unknown Source)
