How about a troubleshooting guide for tree conflicts?
Hi, I've noticed that tree conflicts are a nasty thing that occur now and then but can take half a day to clear out. The tree conflict problem (or field of problems) runs contrary to SVN's attempt to be the intuitive and quirk-free alternative to SVN. In the past, when each directory of the working copy had its own .svn directory, it was easy to make a drop-in replacement of any mixed-up directory... but now that there is one central .svn for the working copy, you may have to discard the whole working copy in order to be able to make commits and use the system normally again. I just had a case where no combination of resolve, cleanup, revert or switch seemed to reset a file (marked with D for deletion) to any usable state. The reason was that an early (grand)parent directory was in an unusual state (replaced or something) but it took long for that to turn out as the reason why the file, a distant leaf in the directory tree, wouldn't revert from its deleted state. Seasoned users and developers of SVN probably know some set of things to try to get quickly past a tree conflict problem. So how about making some sort of a FAQ or a trouble-shooting guide to make such knowledge to a wider audience? Regards, Vesa (Not on the list, please use Cc.)
Re: How about a troubleshooting guide for tree conflicts?
On Fri, Aug 30, 2013 at 12:49:54PM +, Vesa Paatero wrote: Hi, I've noticed that tree conflicts are a nasty thing that occur now and then but can take half a day to clear out. The tree conflict problem (or field of problems) runs contrary to SVN's attempt to be the intuitive and quirk-free alternative to SVN. In the past, when each directory of the working copy had its own .svn directory, it was easy to make a drop-in replacement of any mixed-up directory... but now that there is one central .svn for the working copy, you may have to discard the whole working copy in order to be able to make commits and use the system normally again. I just had a case where no combination of resolve, cleanup, revert or switch seemed to reset a file (marked with D for deletion) to any usable state. The reason was that an early (grand)parent directory was in an unusual state (replaced or something) but it took long for that to turn out as the reason why the file, a distant leaf in the directory tree, wouldn't revert from its deleted state. Seasoned users and developers of SVN probably know some set of things to try to get quickly past a tree conflict problem. So how about making some sort of a FAQ or a trouble-shooting guide to make such knowledge to a wider audience? Regards, Vesa (Not on the list, please use Cc.) The SVN Book has a short chapter about tree conflicts which I wrote: http://svnbook.red-bean.com/en/1.7/svn.tour.treeconflicts.html However, it falls short of covering complex issues people actually run into in real life. Because, so far, the biggest issue with documenting this has been the huge number of possible cases people can run into. It's easy to document and explain the simple cases. But it is very hard to anticipate what can happen in real life, and how users might want to resolve such conflicts. It is also very hard to clearly describe complex conflicts without overwhelming novice users. It's a lot of work to come up with useful complex examples and document them thoroughly. So I usually end up giving either very generic advice of the form first, understand where the conflict came from, then figure out how you want to resolve it, and then come up with svn commands that set your working copy into the desired state, or I walk users through resolution ideas based on detailed conflict reproduction transcripts provided by users themselves (but most people don't provide enough info for that when they ask for help on this list). What I would suggest is that we start a wiki page at http://wiki.apache.org/subversion/ which collects real examples people have run into, and walks through them. Perhaps we can end up with a nice collection of hints that can help inspire people trying to resolve tree conflicts. It could even be moved into the SVN Book eventually, into a new advanced chapter on tree conflicts, for instance. Would you like to volunteer starting off such a list with the case you encountered, and motivate others to do the same? Note that we're also trying to improve the user experience with each new release. For example, Subversion 1.8 can handle tree conflicts involving locally moved files or directories quite well. We hope to improve this further in Subversion 1.9 and beyond.
RE: How about a troubleshooting guide for tree conflicts?
-Original Message- From: Stefan Sperling [mailto:s...@elego.de] Sent: Friday, August 30, 2013 9:09 AM To: Vesa Paatero Cc: users@subversion.apache.org Subject: Re: How about a troubleshooting guide for tree conflicts? The SVN Book has a short chapter about tree conflicts which I wrote: http://svnbook.red-bean.com/en/1.7/svn.tour.treeconflicts.html However, it falls short of covering complex issues people actually run into in real life. How about we start with a list of the possible error messages? =) IME, a merge conflict means you, the user, have to manually recreate the tree via svn copy, svn mv, etc. commands. Which is a *huge* perception/paradigm change from how file merges are handled. Meaning, tree conflicts have zero automation/help from svn. Once you accept that, and learn how to read the messages, tree conflicts aren't that mysterious anymore.
Re: subversion load fails with “no such revision”
I still haven't been able to make any progress on this. If ServerFault and this mailing list aren't going to be adequate to solve the problem, could someone suggest an alternative? Thanks, -Harlan On Thu, Aug 29, 2013 at 8:21 AM, Harlan Harris har...@harris.name wrote: Hi. This is crossposted from ServerFaulthttp://serverfault.com/questions/534553/subversion-load-fails-with-no-such-revision. I'm not subscribed to this list, so a cc would be appreciated. (Or feel free to just respond on ServerFault. So far it's got a couple of upvotes, but no responses.) I'm trying to learn how to migrate a Subversion repo, and am running into an issue that doesn't make sense to me. I've used `svndumpfilter` to split out a sub-project, and have removed some path prefixes. Several hundred commits now import correctly, but then I'm getting the following error: Started new transaction, based on original revision 19190 * editing path : branches/features/DynamicSource ... done. * editing path : branches/features/DynamicSource/src/build.properties ... done. * editing path : branches/features/DynamicSource/src/client/default.htm ...done. * editing path : branches/features/DynamicSource/src/client/js/AdHocController.js ... done. * editing path : branches/features/DynamicSource/src/client/js/Report.js ... done. svnadmin: E160006: No such revision 19098 * adding path : branches/features/DynamicSource/src/client/js/Enums.js ... OK, so I go into the dump file to look at revisions 19190 and 19098. First of all, revision 19098 _does_ exist in the dump file and was imported without a problem. Revision 19190 is a merge. Within 19190, here's that last file's info, which seems to be causing the issue: Node-copyfrom-rev: 19100 Node-copyfrom-path: trunk/src/client/js/Enums.js Text-copy-source-md5: 2db7f8d9c0ba4750d88ce0722731aad6 Node-path: branches/features/DynamicSource/src/client/js/Enums.js Node-action: add Text-copy-source-sha1: 8f930509f8dbc17c5e82cd40aa5a76454d3d812c Node-kind: file Content-length: 0 Confusingly, revision 19100 does NOT exist in this filtered file. But the error's not referring to 19100, it's referring to 19098! What do I do to get this file to load? Thanks!
Re: subversion load fails with “no such revision”
Guten Tag Harlan Harris, am Freitag, 30. August 2013 um 16:06 schrieben Sie: I still haven't been able to make any progress on this. If ServerFault and this mailing list aren't going to be adequate to solve the problem, could someone suggest an alternative? Thanks, The easiest workaround most of the time is to simply not use svndumpfilter, but create as many repos as you need with all the dumped data and afterwards delete and move directories within the new repos using subversion clients. Mit freundlichen Grüßen, Thorsten Schöning -- Thorsten Schöning E-Mail:thorsten.schoen...@am-soft.de AM-SoFT IT-Systeme http://www.AM-SoFT.de/ Telefon...05151- 9468- 55 Fax...05151- 9468- 88 Mobil..0178-8 9468- 04 AM-SoFT GmbH IT-Systeme, Brandenburger Str. 7c, 31789 Hameln AG Hannover HRB 207 694 - Geschäftsführer: Andreas Muchow
Re: subversion load fails with “no such revision”
Harlan Harris harlan.har...@gmail.com writes: I still haven't been able to make any progress on this. If ServerFault and this mailing list aren't going to be adequate to solve the problem, could someone suggest an alternative? Thanks, Splitting up repositories is not trivial and it is not clear, to me at least, exactly what you are doing. On Thu, Aug 29, 2013 at 8:21 AM, Harlan Harris har...@harris.name wrote: Hi. This is crossposted from ServerFaulthttp://serverfault.com/questions/534553/subversion-load-fails-with-no-such-revision. I'm not subscribed to this list, so a cc would be appreciated. (Or feel free to just respond on ServerFault. So far it's got a couple of upvotes, but no responses.) I'm trying to learn how to migrate a Subversion repo, and am running into an issue that doesn't make sense to me. I've used `svndumpfilter` to split out a sub-project, and have removed some path prefixes. Several hundred commits now import correctly, but then I'm getting the following error: Started new transaction, based on original revision 19190 * editing path : branches/features/DynamicSource ... done. * editing path : branches/features/DynamicSource/src/build.properties ... done. * editing path : branches/features/DynamicSource/src/client/default.htm ...done. * editing path : branches/features/DynamicSource/src/client/js/AdHocController.js ... done. * editing path : branches/features/DynamicSource/src/client/js/Report.js ... done. svnadmin: E160006: No such revision 19098 * adding path : branches/features/DynamicSource/src/client/js/Enums.js ... OK, so I go into the dump file to look at revisions 19190 and 19098. First of all, revision 19098 _does_ exist in the dump file and was imported without a problem. That error refers to r19098 in the repository, does that revision exist? Which revision was created by loading r19098? Revision 19190 is a merge. Within 19190, here's that last file's info, which seems to be causing the issue: Node-copyfrom-rev: 19100 Node-copyfrom-path: trunk/src/client/js/Enums.js Text-copy-source-md5: 2db7f8d9c0ba4750d88ce0722731aad6 Node-path: branches/features/DynamicSource/src/client/js/Enums.js Node-action: add Text-copy-source-sha1: 8f930509f8dbc17c5e82cd40aa5a76454d3d812c Node-kind: file Content-length: 0 Confusingly, revision 19100 does NOT exist in this filtered file. But the error's not referring to 19100, it's referring to 19098! Perhaps there is a bug in the load renumbering, but it's hard to say because it's not clear what you are doing. You mention several hundred but you are dealing with revisons much higher. How did you produce the dump file? How did you filter it? How many revisions in the dumpfile? Are they sequential? How many revisions in the destination repository? Aside from the renumbering problem, you say that r19098 exists in the dumpfile but r19100 does not. I don't think there is any way you can load r19190 if it refers to r19100. A dump may refer to revisions before the start of the dump but that is not the case here. You have a reference to a missing revision withing the dump range. What do you expect load to do? -- Philip Martin | Subversion Committer WANdisco // *Non-Stop Data*
Re: subversion load fails with “no such revision”
Thanks, Thorsten. That makes sense. I guess disk space is cheap now...! -Harlan On Fri, Aug 30, 2013 at 10:23 AM, Thorsten Schöning tschoen...@am-soft.dewrote: Guten Tag Harlan Harris, am Freitag, 30. August 2013 um 16:06 schrieben Sie: I still haven't been able to make any progress on this. If ServerFault and this mailing list aren't going to be adequate to solve the problem, could someone suggest an alternative? Thanks, The easiest workaround most of the time is to simply not use svndumpfilter, but create as many repos as you need with all the dumped data and afterwards delete and move directories within the new repos using subversion clients. Mit freundlichen Grüßen, Thorsten Schöning -- Thorsten Schöning E-Mail:thorsten.schoen...@am-soft.de AM-SoFT IT-Systeme http://www.AM-SoFT.de/ Telefon...05151- 9468- 55 Fax...05151- 9468- 88 Mobil..0178-8 9468- 04 AM-SoFT GmbH IT-Systeme, Brandenburger Str. 7c, 31789 Hameln AG Hannover HRB 207 694 - Geschäftsführer: Andreas Muchow
Re: Apache Subversion 1.7.13 released
On 8/30/13 8:34 AM, Ben Reser wrote: I'm happy to announce the release of Apache Subversion 1.7.13. Please note that Subversion 1.7.13 is the next release after Subversion 1.7.11. The 1.7.12 release was not published publicly, due to issues found during testing. Please choose the mirror closest to you by visiting: http://subversion.apache.org/download/#recommended-release This release addresses one security issue: CVE-2013-4246: svnserve: symlink attack against pid file More information on this vulnerability, including the relevant advisory and potential attack vectors and workarounds, can be found on the Subversion security website: http://subversion.apache.org/security/ CVE-2013-4246 was incorrectly used in this announcement. The correct list of security issues follows: CVE-2013-4277: svnserve: symlink attack against pid file
Re: Apache Subversion 1.8.3 released
On 8/30/13 8:34 AM, Ben Reser wrote: I'm happy to announce the release of Apache Subversion 1.8.3. Please note that Subversion 1.8.3 is the next release after Subversion 1.8.1. The 1.8.2 release was not published publicly, due to issues found during testing. Please choose the mirror closest to you by visiting: http://subversion.apache.org/download/#recommended-release This release addresses three security issues: CVE-2013-4246: fsfs: corruption from editing packed revision properties CVE-2013-4262: admin-side tools: symlink attack against pid file CVE-2013-4246: svnserve: symlink attack against pid file More information on these vulnerabilities, including the relevant advisories and potential attack vectors and workarounds, can be found on the Subversion security website: http://subversion.apache.org/security/ CVE-2013-4246 was inadvertantly used twice in this announcement. The corrent list of security issues follows: CVE-2013-4246: fsfs: corruption from editing packed revision properties CVE-2013-4262: admin-side tools: symlink attack against pid file CVE-2013-4277: svnserve: symlink attack against pid file
Apache Subversion 1.8.3 released
I'm happy to announce the release of Apache Subversion 1.8.3. Please note that Subversion 1.8.3 is the next release after Subversion 1.8.1. The 1.8.2 release was not published publicly, due to issues found during testing. Please choose the mirror closest to you by visiting: http://subversion.apache.org/download/#recommended-release This release addresses three security issues: CVE-2013-4246: fsfs: corruption from editing packed revision properties CVE-2013-4262: admin-side tools: symlink attack against pid file CVE-2013-4246: svnserve: symlink attack against pid file More information on these vulnerabilities, including the relevant advisories and potential attack vectors and workarounds, can be found on the Subversion security website: http://subversion.apache.org/security/ This release changes mod_dav_svn to no longer map requests to the local filesystem. Administrators of mod_dav_svn servers should read the section about this in the release notes: http://subversion.apache.org/docs/release-notes/1.8.html#mod_dav_svn-fsmap The SHA1 checksums are: e328e9f1c57f7c78bea4c3af869ec5d4503580cf subversion-1.8.3.tar.bz2 f004934ef6ed8ee4ede1202e0734098350d80812 subversion-1.8.3.zip 4bc7cceb0d16a09ba839a53435f5671d40867d44 subversion-1.8.3.tar.gz PGP Signatures are available at: http://www.apache.org/dist/subversion/subversion-1.8.3.tar.bz2.asc http://www.apache.org/dist/subversion/subversion-1.8.3.tar.gz.asc http://www.apache.org/dist/subversion/subversion-1.8.3.zip.asc For this release, the following people have provided PGP signatures: Ben Reser [4096R/16A0DE01] with fingerprint: 19BB CAEF 7B19 B280 A0E2 175E 62D4 8FAD 16A0 DE01 Bert Huijben [4096R/CCC8E1DF] with fingerprint: 3D1D C66D 6D2E 0B90 3952 8138 C4A6 C625 CCC8 E1DF Ivan Zhakov [4096R/F6AD8147] with fingerprint: 4829 8F0F E47F 4B8A 43FD 6525 919F 6F61 F6AD 8147 Julian Foad [4096R/4EECC493] with fingerprint: 6011 63CF 9D49 9FD7 18CF 582D 1FB0 64B8 4EEC C493 Paul T. Burba [4096R/56F3D7BC] with fingerprint: 1A0F E7C6 B3C5 F8D4 D0C4 A20B 64DD C071 56F3 D7BC Philip Martin [2048R/ED1A599C] with fingerprint: A844 790F B574 3606 EE95 9207 76D7 88E1 ED1A 599C Release notes for the 1.8.x release series may be found at: http://subversion.apache.org/docs/release-notes/1.8.html You can find the list of changes between 1.8.3 and earlier versions at: http://svn.apache.org/repos/asf/subversion/tags/1.8.3/CHANGES Questions, comments, and bug reports to users@subversion.apache.org. Thanks, - The Subversion Team
Apache Subversion 1.7.13 released
I'm happy to announce the release of Apache Subversion 1.7.13. Please note that Subversion 1.7.13 is the next release after Subversion 1.7.11. The 1.7.12 release was not published publicly, due to issues found during testing. Please choose the mirror closest to you by visiting: http://subversion.apache.org/download/#recommended-release This release addresses one security issue: CVE-2013-4246: svnserve: symlink attack against pid file More information on this vulnerability, including the relevant advisory and potential attack vectors and workarounds, can be found on the Subversion security website: http://subversion.apache.org/security/ This release changes mod_dav_svn to no longer map requests to the local filesystem. Administrators of mod_dav_svn servers should read the section about this in the release notes: http://subversion.apache.org/docs/release-notes/1.7.html#mod_dav_svn-fsmap The SHA1 checksums are: 3dad15f19dd43477cc48174a0284e792e32b7a97 subversion-1.7.13.zip 9fa8d49a18e58403ce5b855e65f748ddd86bba09 subversion-1.7.13.tar.gz 844bb756ec505edaa12b9610832bcd21567139f1 subversion-1.7.13.tar.bz2 PGP Signatures are available at: http://www.apache.org/dist/subversion/subversion-1.7.13.tar.bz2.asc http://www.apache.org/dist/subversion/subversion-1.7.13.tar.gz.asc http://www.apache.org/dist/subversion/subversion-1.7.13.zip.asc For this release, the following people have provided PGP signatures: Ben Reser [4096R/16A0DE01] with fingerprint: 19BB CAEF 7B19 B280 A0E2 175E 62D4 8FAD 16A0 DE01 Ivan Zhakov [4096R/F6AD8147] with fingerprint: 4829 8F0F E47F 4B8A 43FD 6525 919F 6F61 F6AD 8147 Johan Corveleyn [4096R/010C8AAD] with fingerprint: 8AA2 C10E EAAD 44F9 6972 7AEA B59C E6D6 010C 8AAD Julian Foad [4096R/4EECC493] with fingerprint: 6011 63CF 9D49 9FD7 18CF 582D 1FB0 64B8 4EEC C493 Paul T. Burba [4096R/56F3D7BC] with fingerprint: 1A0F E7C6 B3C5 F8D4 D0C4 A20B 64DD C071 56F3 D7BC Philip Martin [2048R/ED1A599C] with fingerprint: A844 790F B574 3606 EE95 9207 76D7 88E1 ED1A 599C Release notes for the 1.7.x release series may be found at: http://subversion.apache.org/docs/release-notes/1.7.html You can find the list of changes between 1.7.13 and earlier versions at: http://svn.apache.org/repos/asf/subversion/tags/1.7.13/CHANGES Questions, comments, and bug reports to users@subversion.apache.org. Thanks, - The Subversion Team
Re: subversion load fails with “no such revision”
Guten Tag Harlan Harris, am Freitag, 30. August 2013 um 17:10 schrieben Sie: I guess disk space is cheap now...! It's especially cheaper than your time if you only need to version a bit of web application stuff and, depending on the version of your old repos, newer repos may even reduce disk space because of representation sharing and some improvements in storing directory structures in Subversion 1.8. Mit freundlichen Grüßen, Thorsten Schöning -- Thorsten Schöning E-Mail:thorsten.schoen...@am-soft.de AM-SoFT IT-Systeme http://www.AM-SoFT.de/ Telefon...05151- 9468- 55 Fax...05151- 9468- 88 Mobil..0178-8 9468- 04 AM-SoFT GmbH IT-Systeme, Brandenburger Str. 7c, 31789 Hameln AG Hannover HRB 207 694 - Geschäftsführer: Andreas Muchow
Re: subversion load fails with “no such revision”
Tony, I used the seemingly-standard version of dumpfilter, not the 2 or 3 versions. But then I also did the search/replace trick that others had suggested to shift paths around. I don't think that's the issue, but I'm not sure. Thorsten, I wish it was just a bit of web application stuff, but it's actually a 5-year-old enterprise repo that was horribly abused, including checkins of very large binary and data files. The dump file of the whole thing is about 25 GB in size. That's part of why I want to split it up and filtering things out. I'm going to try just exporting the last month worth of revisions, and see if that works better. We may have to sacrifice most history in the interest of actually getting this working. -Harlan On Fri, Aug 30, 2013 at 11:41 AM, Thorsten Schöning tschoen...@am-soft.dewrote: Guten Tag Harlan Harris, am Freitag, 30. August 2013 um 17:10 schrieben Sie: I guess disk space is cheap now...! It's especially cheaper than your time if you only need to version a bit of web application stuff and, depending on the version of your old repos, newer repos may even reduce disk space because of representation sharing and some improvements in storing directory structures in Subversion 1.8. Mit freundlichen Grüßen, Thorsten Schöning -- Thorsten Schöning E-Mail:thorsten.schoen...@am-soft.de AM-SoFT IT-Systeme http://www.AM-SoFT.de/ Telefon...05151- 9468- 55 Fax...05151- 9468- 88 Mobil..0178-8 9468- 04 AM-SoFT GmbH IT-Systeme, Brandenburger Str. 7c, 31789 Hameln AG Hannover HRB 207 694 - Geschäftsführer: Andreas Muchow
