How to use TortoiseSVN to resolve the upgrade conflicts?

0
Hi Community, I have upgrade my application from 6.10.4 version to 7.2.0 version and resolved all the issues during the upgrade. Now I am trying to test my application and got some conflicts. Please find the below conflicts. Please find the below conflicts:- 1. Error occurred on rollback database transaction. Cannot invoke a rollback operation when the AutoCommit mode is set to "true". 2. See the below conflict. JdbcDataStore::execRetrieveQuery caught SQLException without error number; broken JDBC driver? Message: Connection is null. -------- java.sql.SQLException: Connection is null.     at org.apache.commons.dbcp2.DelegatingConnection.checkOpen(DelegatingConnection.java:608)     at org.apache.commons.dbcp2.DelegatingConnection.createStatement(DelegatingConnection.java:255)     at com.mendix.connectionbus.connections.jdbc.JdbcDataStore.execRetrieveQuery(JdbcDataStore.java:323)     at com.mendix.connectionbus.connections.jdbc.JdbcDataStore.execRetrieveQueries(JdbcDataStore.java:215)     at com.mendix.connectionbus.connections.jdbc.JdbcDataStore.retrieve(JdbcDataStore.java:179)     at com.mendix.connectionbus.connections.jdbc.JdbcDataStore.retrieve(JdbcDataStore.java:168)     at com.mendix.connectionbus.retrieve.DataStoreCaller.executeQueries(DataStoreCaller.java:229)     at com.mendix.connectionbus.retrieve.DataStoreCaller.executeQueries(DataStoreCaller.java:196)     at com.mendix.connectionbus.retrieve.DataStoreCaller.getResult(DataStoreCaller.java:77)     at com.mendix.connectionbus.retrieve.GetRequestHandler.doRequest(GetRequestHandler.java:69)     at com.mendix.connectionbus.RequestAnalyzer.doRequest(RequestAnalyzer.java:44)     at com.mendix.connectionbus.ConnectionBusImpl.doRequest(ConnectionBusImpl.java:463)     at com.mendix.basis.action.user.RetrieveXPathRawAction.retrieveXPathRaw(RetrieveXPathRawAction.java:123)     at com.mendix.basis.action.user.RetrieveXPathRawAction.executeAction(RetrieveXPathRawAction.java:69)     at com.mendix.basis.action.user.RetrieveXPathAction.executeAction(RetrieveXPathAction.java:49)     at com.mendix.basis.action.user.RetrieveXPathAction.executeAction(RetrieveXPathAction.java:17)     at com.mendix.systemwideinterfaces.core.UserAction.execute(UserAction.java:50)     at com.mendix.basis.actionmanagement.CoreActionHandlerImpl.doCall(CoreActionHandlerImpl.scala:73)     at com.mendix.basis.actionmanagement.CoreActionHandlerImpl.call(CoreActionHandlerImpl.scala:53)     at com.mendix.core.actionmanagement.CoreAction.call(CoreAction.java:51)     at com.mendix.basis.actionmanagement.ActionManager$1.execute(ActionManager.java:170)     at com.mendix.util.classloading.Runner.doRunUsingClassLoaderOf(Runner.java:33)     at com.mendix.basis.actionmanagement.ActionManager.executeSync(ActionManager.java:174)     at com.mendix.basis.component.InternalCore.retrieveXPathQuery(InternalCore.java:1300)     at com.mendix.basis.component.InternalCore.retrieveXPathQuery(InternalCore.java:1266)     at com.mendix.modules.microflowengine.actions.mxobject.RetrieveByXPathAction.execute(RetrieveAction.scala:76)     at com.mendix.modules.microflowengine.microflow.impl.MicroflowObject.execute(MicroflowObject.java:47)     at com.mendix.modules.microflowengine.microflow.impl.MicroflowImpl.executeAfterBreakingIfNecessary(MicroflowImpl.java:200)     at com.mendix.modules.microflowengine.microflow.impl.MicroflowImpl.executeAction(MicroflowImpl.java:157)     at com.mendix.systemwideinterfaces.core.UserAction.execute(UserAction.java:50)     at com.mendix.basis.actionmanagement.CoreActionHandlerImpl.doCall(CoreActionHandlerImpl.scala:73)     at com.mendix.basis.actionmanagement.CoreActionHandlerImpl.call(CoreActionHandlerImpl.scala:53)     at com.mendix.core.actionmanagement.CoreAction.call(CoreAction.java:51)     at com.mendix.basis.actionmanagement.ActionManager$1.execute(ActionManager.java:170)     at com.mendix.util.classloading.Runner.doRunUsingClassLoaderOf(Runner.java:33)     at com.mendix.basis.actionmanagement.ActionManager.executeSync(ActionManager.java:174)     at com.mendix.basis.component.InternalCore.execute(InternalCore.java:531)     at com.mendix.basis.objectmanagement.MendixObjectMemberImpl.getValue(MendixObjectMemberImpl.java:199)     at com.mendix.webui.jsonserialization.MemberValueConverter$.getValue$1(MemberValueConverter.scala:24)     at com.mendix.webui.jsonserialization.MemberValueConverter$.transformOriginalMemberValue(MemberValueConverter.scala:35)     at com.mendix.webui.jsonserialization.ResultSerializer.generateMendixObjectMember(ResultSerializer.scala:180)     at com.mendix.webui.jsonserialization.ResultSerializer.com$mendix$webui$jsonserialization$ResultSerializer$$generateMemberValue(ResultSerializer.scala:170)     at com.mendix.webui.jsonserialization.ResultSerializer$$anonfun$com$mendix$webui$jsonserialization$ResultSerializer$$generateMendixObject$1.apply(ResultSerializer.scala:146)     at com.mendix.webui.jsonserialization.ResultSerializer$$anonfun$com$mendix$webui$jsonserialization$ResultSerializer$$generateMendixObject$1.apply(ResultSerializer.scala:142)     at scala.collection.Iterator$class.foreach(Iterator.scala:893)     at scala.collection.AbstractIterator.foreach(Iterator.scala:1336)     at scala.collection.IterableLike$class.foreach(IterableLike.scala:72)     at scala.collection.AbstractIterable.foreach(Iterable.scala:54)     at com.mendix.webui.jsonserialization.ResultSerializer.com$mendix$webui$jsonserialization$ResultSerializer$$generateMendixObject(ResultSerializer.scala:142)     at com.mendix.webui.jsonserialization.ResultSerializer.com$mendix$webui$jsonserialization$ResultSerializer$$generate(ResultSerializer.scala:80)     at com.mendix.webui.jsonserialization.ResultSerializer$$anonfun$generateIterable$1.apply(ResultSerializer.scala:111)     at com.mendix.webui.jsonserialization.ResultSerializer$$anonfun$generateIterable$1.apply(ResultSerializer.scala:111)     at scala.collection.immutable.List.foreach(List.scala:381)     at com.mendix.webui.jsonserialization.ResultSerializer.generateIterable(ResultSerializer.scala:111)     at com.mendix.webui.jsonserialization.ResultSerializer.com$mendix$webui$jsonserialization$ResultSerializer$$generate(ResultSerializer.scala:85)     at com.mendix.webui.jsonserialization.ResultSerializer.generate(ResultSerializer.scala:65)     at com.mendix.webui.requesthandling.ClientRequestHandler$$anonfun$com$mendix$webui$requesthandling$ClientRequestHandler$$convertClientActionResult$1.apply(ClientRequestHandler.scala:457)     at com.mendix.webui.requesthandling.ClientRequestHandler$$anonfun$com$mendix$webui$requesthandling$ClientRequestHandler$$convertClientActionResult$1.apply(ClientRequestHandler.scala:453)     at scala.collection.mutable.HashMap$$anonfun$foreach$1.apply(HashMap.scala:99)     at scala.collection.mutable.HashMap$$anonfun$foreach$1.apply(HashMap.scala:99)     at scala.collection.mutable.HashTable$class.foreachEntry(HashTable.scala:230)     at scala.collection.mutable.HashMap.foreachEntry(HashMap.scala:40)     at scala.collection.mutable.HashMap.foreach(HashMap.scala:99)     at com.mendix.webui.requesthandling.ClientRequestHandler.com$mendix$webui$requesthandling$ClientRequestHandler$$convertClientActionResult(ClientRequestHandler.scala:453)     at com.mendix.webui.requesthandling.ClientRequestHandler$$anonfun$handleRequest$1.apply$mcV$sp(ClientRequestHandler.scala:335)     at com.mendix.webui.requesthandling.ClientRequestHandler$$anonfun$handleRequest$1.apply(ClientRequestHandler.scala:293)     at com.mendix.webui.requesthandling.ClientRequestHandler$$anonfun$handleRequest$1.apply(ClientRequestHandler.scala:293)     at com.mendix.basis.actionmanagement.IMonitoredAction$$anon$1.execute(IMonitoredAction.scala:47)     at com.mendix.util.classloading.Runner.doRunUsingClassLoaderOf(Runner.java:33)     at com.mendix.basis.actionmanagement.IMonitoredAction$class.monitor(IMonitoredAction.scala:49)     at com.mendix.webui.requesthandling.ClientRequestHandler$ClientMonitoredAction.monitor(ClientRequestHandler.scala:408)     at com.mendix.webui.requesthandling.ClientRequestHandler.handleRequest(ClientRequestHandler.scala:293)     at com.mendix.webui.requesthandling.ClientRequestHandler.handleActionWithSessionRequired(ClientRequestHandler.scala:235)     at com.mendix.webui.requesthandling.ClientRequestHandler.handleAction(ClientRequestHandler.scala:202)     at com.mendix.webui.requesthandling.ClientRequestHandler.liftedTree1$1(ClientRequestHandler.scala:101)     at com.mendix.webui.requesthandling.ClientRequestHandler.processRequest(ClientRequestHandler.scala:93)     at com.mendix.externalinterface.connector.RequestHandler.doProcessRequest(RequestHandler.java:40)     at com.mendix.external.connector.MxRuntimeConnector$1.execute(MxRuntimeConnector.java:70)     at com.mendix.external.connector.MxRuntimeConnector$1.execute(MxRuntimeConnector.java:67)     at com.mendix.util.classloading.Runner.doRunUsingClassLoaderOf(Runner.java:33)     at com.mendix.external.connector.MxRuntimeConnector.processRequest(MxRuntimeConnector.java:73)     at com.mendix.basis.impl.MxRuntimeImpl.processRequest(MxRuntimeImpl.java:885)     at com.mendix.m2ee.appcontainer.server.handler.RuntimeHandler.handle(RuntimeHandler.java:41)     at org.eclipse.jetty.server.handler.HandlerList.handle(HandlerList.java:52)     at org.eclipse.jetty.server.handler.HandlerWrapper.handle(HandlerWrapper.java:116)     at org.eclipse.jetty.server.Server.handle(Server.java:368)     at org.eclipse.jetty.server.AbstractHttpConnection.handleRequest(AbstractHttpConnection.java:489)     at org.eclipse.jetty.server.AbstractHttpConnection.content(AbstractHttpConnection.java:953)     at org.eclipse.jetty.server.AbstractHttpConnection$RequestHandler.content(AbstractHttpConnection.java:1014)     at org.eclipse.jetty.http.HttpParser.parseNext(HttpParser.java:861)     at org.eclipse.jetty.http.HttpParser.parseAvailable(HttpParser.java:240)     at org.eclipse.jetty.server.AsyncHttpConnection.handle(AsyncHttpConnection.java:82)     at org.eclipse.jetty.io.nio.SelectChannelEndPoint.handle(SelectChannelEndPoint.java:628)     at org.eclipse.jetty.io.nio.SelectChannelEndPoint$1.run(SelectChannelEndPoint.java:52)     at org.eclipse.jetty.util.thread.QueuedThreadPool.runJob(QueuedThreadPool.java:608)     at org.eclipse.jetty.util.thread.QueuedThreadPool$3.run(QueuedThreadPool.java:543)     at java.lang.Thread.run(Thread.java:748) 3. See the below conflict. -------- com.mendix.systemwideinterfaces.MendixRuntimeException: org.codehaus.jackson.JsonGenerationException: Can not write a field name, expecting a value     at com.mendix.util.classloading.Runner.doRunUsingClassLoaderOf(Runner.java:37) Caused by: org.codehaus.jackson.JsonGenerationException: Can not write a field name, expecting a value     at org.codehaus.jackson.impl.JsonGeneratorBase._reportError(JsonGeneratorBase.java:480)     at org.codehaus.jackson.impl.WriterBasedGenerator.writeFieldName(WriterBasedGenerator.java:195)     at com.mendix.webui.jsonserialization.JsonGeneratorWrapper$$anonfun$writeFieldName$1.apply(JsonGeneratorWrapper.scala:43)     at com.mendix.webui.jsonserialization.JsonGeneratorWrapper$$anonfun$writeFieldName$1.apply(JsonGeneratorWrapper.scala:43)     at scala.collection.immutable.List.foreach(List.scala:381)     at scala.collection.generic.TraversableForwarder$class.foreach(TraversableForwarder.scala:35)     at scala.collection.mutable.ListBuffer.foreach(ListBuffer.scala:45)     at com.mendix.webui.jsonserialization.JsonGeneratorWrapper.writeFieldName(JsonGeneratorWrapper.scala:43)     at com.mendix.webui.jsonserialization.ResultSerializer.writeException(ResultSerializer.scala:39)     at com.mendix.webui.requesthandling.ClientRequestHandler.com$mendix$webui$requesthandling$ClientRequestHandler$$logAndWriteException(ClientRequestHandler.scala:480)     at com.mendix.webui.requesthandling.ClientRequestHandler.processException(ClientRequestHandler.scala:472)     at com.mendix.webui.requesthandling.ClientRequestHandler.handleRequest(ClientRequestHandler.scala:267)     at com.mendix.webui.requesthandling.ClientRequestHandler.handleActionWithSessionRequired(ClientRequestHandler.scala:235)     at com.mendix.webui.requesthandling.ClientRequestHandler.handleAction(ClientRequestHandler.scala:202)     at com.mendix.webui.requesthandling.ClientRequestHandler.liftedTree1$1(ClientRequestHandler.scala:101)     at com.mendix.webui.requesthandling.ClientRequestHandler.processRequest(ClientRequestHandler.scala:93)     at com.mendix.externalinterface.connector.RequestHandler.doProcessRequest(RequestHandler.java:40)     at com.mendix.external.connector.MxRuntimeConnector$1.execute(MxRuntimeConnector.java:70)     at com.mendix.external.connector.MxRuntimeConnector$1.execute(MxRuntimeConnector.java:67)     at com.mendix.util.classloading.Runner.doRunUsingClassLoaderOf(Runner.java:33)     at com.mendix.external.connector.MxRuntimeConnector.processRequest(MxRuntimeConnector.java:73)     at com.mendix.basis.impl.MxRuntimeImpl.processRequest(MxRuntimeImpl.java:885)     at com.mendix.m2ee.appcontainer.server.handler.RuntimeHandler.handle(RuntimeHandler.java:41)     at org.eclipse.jetty.server.handler.HandlerList.handle(HandlerList.java:52)     at org.eclipse.jetty.server.handler.HandlerWrapper.handle(HandlerWrapper.java:116)     at org.eclipse.jetty.server.Server.handle(Server.java:368)     at org.eclipse.jetty.server.AbstractHttpConnection.handleRequest(AbstractHttpConnection.java:489)     at org.eclipse.jetty.server.AbstractHttpConnection.content(AbstractHttpConnection.java:953)     at org.eclipse.jetty.server.AbstractHttpConnection$RequestHandler.content(AbstractHttpConnection.java:1014)     at org.eclipse.jetty.http.HttpParser.parseNext(HttpParser.java:861)     at org.eclipse.jetty.http.HttpParser.parseAvailable(HttpParser.java:240)     at org.eclipse.jetty.server.AsyncHttpConnection.handle(AsyncHttpConnection.java:82)     at org.eclipse.jetty.io.nio.SelectChannelEndPoint.handle(SelectChannelEndPoint.java:628)     at org.eclipse.jetty.io.nio.SelectChannelEndPoint$1.run(SelectChannelEndPoint.java:52)     at org.eclipse.jetty.util.thread.QueuedThreadPool.runJob(QueuedThreadPool.java:608)     at org.eclipse.jetty.util.thread.QueuedThreadPool$3.run(QueuedThreadPool.java:543)     at java.lang.Thread.run(Thread.java:748)   How can I resolve these conflicts? Some where I saw that I need to use Tortoise SVN to resolve the conflicts during the upgrade. I haven’t used it before. Can you please let me know the steps to follow to resolve the issues. Thank you.
asked
1 answers
1

Hi Venkatesh,

You can download Tortoise SVN version:

TortoiseSVN 1.7.15, Build 25753 - 64 Bit -dev, 2014/08/09 10:23:48
Subversion 1.7.18, 

You can find it here: https://tortoisesvn.net/downloads.html

Once you have installed it, you can go to the file that is conflicted in your project folder, right-click on it and click the tortoise SVN “Resolve” option.

answered