Bug -> SQL Developer 3.0.04 SVN Merge
jgebalNov 25 2011 — edited Nov 30 2011Hello.
I've found a bug when trying to merge files.
The problem occurred when there is a conflict on file content and an update on properties.
The SVN plugin prepares merge (diff) files but the GUI shows that the file is MERGED instead of CONFLICTED, and there is no way to enter the resolve conflicts on that file.
Example log from SVN:
--- Merging r19952 through r20348 into D:/test_sqlDev_svn/us10591/sql/AAA.sql
CG D:/test_sqlDev_svn/us10591/sql/AAA.sql
C -There is a conflict on file content
G - Properties were merged successfully without conflicts
If there is a conflict during merge but properties of file have not changed then everything works fine.
Can you please fix this bug as it causes the usage of SQL Developer SVN features unusable our my environment.
Kind Regards
Jacek Gębal
Edited by: user2242149 on 2011-11-25 07:21
Edited by: user2242149 on 2011-11-25 07:27