SQLite locks while trying to merge or show history after having empty svn:merge-info entries without revisions in branch - Repository migration not possible due to empty svn:merge-info entries
From: Nicolai, Johannes <Johannes.Nicolai_at_student.hpi.uni-potsdam.de>
Date: 2007-12-23 22:06:06 CET
in the last month, I convinced a chair of my university to test and evaluate the new merge tracking facilities on Subversion 1.5-dev.
After some weeks of working, the students and PHDs encountered the first serious problems with SVN:
Merging is no longer possible:
--- commit -m "merged from "branches/cga-seminar-wise0708"" E:/Projekte/cga-seminar-wise0708-ap4 E:/Projekte/cga-seminar-wise0708-ap4/cga ... Sending E:/Projekte/cga-seminar-wise0708-ap4/vrs_anno/win32/vrs_anno/vrs_anno.vcproj Transmitting file data ... SQLite error svn: Commit failed (details follow): svn: MERGE request failed on '/svn/repos/cga/branches/cga-seminar-wise0708-ap4' svn: database is locked --- This error occurs with every client, rebooting the server is the only thing that works. The locking errors seem to relate with viewing the history after a commit in certain directories and trying to merge in a branch that contains commits with empty svn:merge-info entries (only path without any revisions, see below). My first advice was to update the SVN-1.5 to the latest trunk. Unfortunately, migrating the SVN repository does not seem to work: --- svnadmin load /svnroot/testproj < /root/cga-repos-dumps/071222/cga-071222-svnadmin-build-071030 … … … <<< Started new transaction, based on original revision 1186 * editing path : branches/cga-seminar-wise0708-ap3 ... done. * editing path : branches/cga-seminar-wise0708-ap3/cga/cga-vs2005.vcproj ... done. * editing path : branches/cga-seminar-wise0708-ap3/cga/ext/pgomgr ... done. ... * adding path : branches/cga-seminar-wise0708-ap3/cga/vis/sharedwidgets/repositorydatavisualizer/uic ...COPIED... done. * deleting path : branches/cga-seminar-wise0708-ap3/cga/vis/sharedwidgets/repositorydatavisualizer/uic/moc_repositorydatavisualizer.cpp ... done. * adding path : branches/cga-seminar-wise0708-ap3/cga/vis/sharedwidgets/repositorydatavisualizer/uic/moc_repositorydatavisualizer.cpp ...COPIED... done. * editing path : branches/cga-seminar-wise0708-ap3/cga/vis/sharedwidgets/tracechooser ... done. svnadmin: Mergeinfo for '/branches/cga-seminar-wise0708-ap3/cga/ext/pgomgr' maps to an empty revision range --- This problem seems to relate with empty svn:merge-info entries: --- Snippet out of root/cga-repos-dumps/071222/cga-071222-svnadmin-build-071030 … … PROPS-END Node-path: branches/cga-seminar-wise0708-ap3/cga/ext/pgomgr/impl Node-kind: dir Node-action: change Prop-content-length: 236 Content-length: 236 K 13 svn:mergeinfo V 200 /branches/cga-seminar-wise0708/cga/ext/pgomgr/impl:1136,1143-1156,1159-1176 /branches/cga-seminar-wise0708-ap3/cga/ext/pgomgr/impl: /trunk/cga/ext/pgomgr/impl:1-1135,1158-1159,1161,1164-1165,1167-1169 PROPS-END Node-path: branches/cga-seminar-wise0708-ap3/cga/vis/changeimpact Node-kind: dir Node-action: change Prop-content-length: 264 Content-length: 264 K 10 svn:ignore V 4 uic K 13 svn:mergeinfo V 203 /branches/cga-seminar-wise0708/cga/vis/changeimpact:1136,1143-1156,1159-1176 /branches/cga-seminar-wise0708-ap3/cga/vis/changeimpact: /trunk/cga/vis/changeimpact:1-1135,1158-1159,1161,1164-1165,1167-1169 PROPS-END Node-path: branches/cga-seminar-wise0708-ap3/cga/vis/icons Node-kind: dir Node-action: change Prop-content-length: 218 Content-length: 218 K 13 svn:mergeinfo V 182 /branches/cga-seminar-wise0708/cga/vis/icons:1136,1143-1156,1159-1176 /branches/cga-seminar-wise0708-ap3/cga/vis/icons: /trunk/cga/vis/icons:1-1135,1158-1159,1161,1164-1165,1167-1169 PROPS-END Node-path: branches/cga-seminar-wise0708-ap3/cga/vis/metricsevolution Node-kind: dir --- My question now is how to enable the students and PHDs to continue their work. Is there any possibility to migrate the repository to the newest SVN version or is there any possibility to get rid of the SQLLite lock problem? What was the last revision where the repository format has not been changed? Is there a way to manually modify the dump file to be able to reimport it into a newer repository format? Is there a way to change the source code of svnadmin to accept the import of empty svn:merge-info data sets? Because most of the students work during the holidays on their projects, it would be really great if anybody could give me a hint how to proceed. Thanks a lot and happy holidays Johannes Nicolai --------------------------------------------------------------------- To unsubscribe, e-mail: email@example.com For additional commands, e-mail: firstname.lastname@example.orgReceived on Sun Dec 23 22:06:32 2007
This is an archived mail posted to the Subversion Dev mailing list.