AW: Evil UTF-8 Character in filename in repo causing issues on my wc
Hi, Geoff, Von: Geoff Hoffman [mailto:ghoff...@cardinalpath.com] I have a file with some (I believe) Portuguese characters in the filename that someone managed to store in the repo without any problem, and I checked it out without issues, too. However, now on my working copy, it thinks that file is locally new. Maybe it helps if you use a repo browser to rename the file to an ASCII-Only name directly in the repository? That's all I ever really wanted to do, but I cannot, at least, I don't know how to type the characters in the filename of the file in svn without copy-paste from the svn ls terminal output on Mac OS X, which I think has already converted the filename it just printed, so I get a file not found error when I try to rename or delete it. It may have worked if I had ssh'd into the RHEL server, not sure. It's a bit unclear. I thought of some graphical repository browser (like the one built into TortoiseSVN for example, I guess such things also exist for MacOS), it lets you browse the repository and select the file to rename directly in the repository, without the need of a local checkout / working copy. Best regards Markus Schaber -- ___ We software Automation. 3S-Smart Software Solutions GmbH Markus Schaber | Developer Memminger Str. 151 | 87439 Kempten | Germany | Tel. +49-831-54031-0 | Fax +49-831-54031-50 Email: m.scha...@3s-software.com | Web: http://www.3s-software.com CoDeSys internet forum: http://forum.3s-software.com Download CoDeSys sample projects: http://www.3s-software.com/index.shtml?sample_projects Managing Directors: Dipl.Inf. Dieter Hess, Dipl.Inf. Manfred Werner | Trade register: Kempten HRB 6186 | Tax ID No.: DE 167014915
Re: Problem tagging from mixed rev working copy with a rename (copy+delete) from the past inside
Daniel Shahaf wrote: Wolfgang Röckelein wrote on Wed, Jun 15, 2011 at 10:05:16 +0200: I have two problems when creating a tag from a mixed rev working copy. Both problems are caused by a rename (copy+delete) from the past inside. One case is a directory, here I get the following error, is the deleted local directory path: Working copy not locked; this is probably a bug, please report svn: Directory '' is missing Can't find a working copy path svn: Directory '' is missing Other case is a file, here I get the following error, is the deleted file (relative path), is the tag path: Working copy is not up-to-date svn: Commit failed (details follow): svn: File '' is out of date Filesystem has no item svn: '/svn/mobil/!svn/wrk/4263dc38-ec4c-9042-9505-c5fb37cf8ea7//' path not found Can I do anything to create the tag/copy somehow? Because of the mixed rev working copy copying from head or a rev is not an option. svnmucc, or URL-URL copy then checkout the tag and commit changes the usual way. URL-URL copy will not work because of the mixed rev working copy. The problem is not outstanding commit in the WC but the mixed rev! I can also not see how svnmucc would help me here. Thank you, Wolfgang
Re: Problem tagging from mixed rev working copy with a rename (copy+delete) from the past inside
Wolfgang Röckelein wrote on Thu, Jun 16, 2011 at 08:45:18 +0200: Daniel Shahaf wrote: Wolfgang Röckelein wrote on Wed, Jun 15, 2011 at 10:05:16 +0200: I have two problems when creating a tag from a mixed rev working copy. Both problems are caused by a rename (copy+delete) from the past inside. One case is a directory, here I get the following error, is the deleted local directory path: Working copy not locked; this is probably a bug, please report svn: Directory '' is missing Can't find a working copy path svn: Directory '' is missing Other case is a file, here I get the following error, is the deleted file (relative path), is the tag path: Working copy is not up-to-date svn: Commit failed (details follow): svn: File '' is out of date Filesystem has no item svn: '/svn/mobil/!svn/wrk/4263dc38-ec4c-9042-9505-c5fb37cf8ea7//' path not found Can I do anything to create the tag/copy somehow? Because of the mixed rev working copy copying from head or a rev is not an option. svnmucc, or URL-URL copy then checkout the tag and commit changes the usual way. URL-URL copy will not work because of the mixed rev working copy. The problem is not outstanding commit in the WC but the mixed rev! I can also not see how svnmucc would help me here. 2. svnmucc -mm cp $U/trunk $U/tags/foo rm $U/tags/foo/subd cp 42 $U/trunk/foo/subd $U/tags/foo/subd Have a look at 'svn log -qv' of a mixed-revision-working-copy tag... that's what it does. 1. svn cp ^/trunk ^/tags/foo -m tagging part 1 svn sw ^/tags/foo svn rm subd svn cp ^/trunk/subd@42 subd svn ci -m Backdate subd, completing the tag Thank you, Wolfgang
Re: Problem with mod_dav_svn and svn_repos__post_commit_error_str
Thanks. That was the problem. A version of svn installed with the os. Removing the older version fixed it. Thanks for your help. Chris On 16/06/2011 00:11, Daniel Shahaf wrote: Do you have a pre-1.6.17 libsvn_repos on the system? (That symbol is defined by libsvn_repos, and I suspect it's only defined by recent versions of that.) Chris Wolstenholme wrote on Wed, Jun 15, 2011 at 10:35:06 +0100: Hi, I'm having a problem using the mod_dav_svn module with Apache and a newly built subversion (version 1.6.17). This usually works out of the box, but I have an undefined symbol (svn_repos__post_commit_error_str) which means apache can't load the module. The apache version is 2.2.17. The code was built with gcc 4.4.1 'apachectl configtest' results in: httpd: Syntax error on line 72 of httpd.conf: Cannot load mod_dav_svn.so into server: mod_dav_svn.so: undefined symbol: svn_repos__post_commit_error_str 'ldd -r modules/mod_dav_svn.so' shows the symbol as undefined, but looking at the version in the build tree (subversion/mod_dav_svn/.libs/mod_dav_svn.so) it doesn't contain that symbol. It is only added after a relink, which happens at install time. I have seen other undefined symbol problems and solutions posted, but they seem unrelated to this one, and so any help would be appreciated. Thanks in advance, Chris - No virus found in this message. Checked by AVG - www.avg.com Version: 10.0.1382 / Virus Database: 1513/3705 - Release Date: 06/15/11
Re: Problem tagging from mixed rev working copy with a rename (copy+delete) from the past inside
On Wed, Jun 15, 2011 at 10:05:16AM +0200, Wolfgang Röckelein wrote: Hi, I have two problems when creating a tag from a mixed rev working copy. Both problems are caused by a rename (copy+delete) from the past inside. One case is a directory, here I get the following error, is the deleted local directory path: Working copy not locked; this is probably a bug, please report svn: Directory '' is missing Can't find a working copy path svn: Directory '' is missing Other case is a file, here I get the following error, is the deleted file (relative path), is the tag path: Working copy is not up-to-date svn: Commit failed (details follow): svn: File '' is out of date Filesystem has no item svn: '/svn/mobil/!svn/wrk/4263dc38-ec4c-9042-9505-c5fb37cf8ea7//' path not found Which version of Subversion are you using? It's very likely that this problem has been fixed in 1.7. Are you able to test your steps with the 1.7.0-alpha1 release to verify that it has been fixed? Thanks in advance! Depending on your operating system there might even be 1.7.0-alpha1 binaries available you can use, so you won't have to compile your own. But I'm not sure where to link to because you didn't say which OS you are using. (In the future, please consider including a short line like this in your problem reports: I am using Subversion 1.6.17 on Ubuntu 10.04. As you can tell, knowing this information upfront always helps us :)
Re: Backing Data
On Wednesday 15 June 2011, Konstantin Kolinko wrote: 2011/6/15 Herbie Marais herbie.mar...@tpt.com: Our employees often work remotely and the source control system needs to be able to recover is the connection is interrupted while the user is busy checking in a file. 2. It works fine. The files are transmitted and after that the transaction is performed in one step. If connection is aborted the stale files are left behind. The svnadmin rmtxns command is there to remove them. That is with FSFS backend. I do not have practical experience with BDB one. In any case, the commits are as atomic as you would expect from a database. In particular these half commits don't block the system for other users, neither with the FSFS nor the current BDB backend, so you don't have to get to an admin to run rmtxns on the repository. Uli ** Domino Laser GmbH, Fangdieckstraße 75a, 22547 Hamburg, Deutschland Geschäftsführer: Thorsten Föcking, Amtsgericht Hamburg HR B62 932 ** Visit our website at http://www.dominolaser.com ** Diese E-Mail einschließlich sämtlicher Anhänge ist nur für den Adressaten bestimmt und kann vertrauliche Informationen enthalten. Bitte benachrichtigen Sie den Absender umgehend, falls Sie nicht der beabsichtigte Empfänger sein sollten. Die E-Mail ist in diesem Fall zu löschen und darf weder gelesen, weitergeleitet, veröffentlicht oder anderweitig benutzt werden. E-Mails können durch Dritte gelesen werden und Viren sowie nichtautorisierte Änderungen enthalten. Domino Laser GmbH ist für diese Folgen nicht verantwortlich. **
Re: Problem tagging from mixed rev working copy with a rename (copy+delete) from the past inside
Stefan Sperling wrote: On Wed, Jun 15, 2011 at 10:05:16AM +0200, Wolfgang Röckelein wrote: I have two problems when creating a tag from a mixed rev working copy. Both problems are caused by a rename (copy+delete) from the past inside. One case is a directory, here I get the following error, is the deleted local directory path: Working copy not locked; this is probably a bug, please report svn: Directory '' is missing Can't find a working copy path svn: Directory '' is missing Other case is a file, here I get the following error, is the deleted file (relative path), is the tag path: Working copy is not up-to-date svn: Commit failed (details follow): svn: File '' is out of date Filesystem has no item svn: '/svn/mobil/!svn/wrk/4263dc38-ec4c-9042-9505-c5fb37cf8ea7//' path not found Which version of Subversion are you using? 1.6.17 on client, 1.6.15 or 1.6.16 on server, I am not sure when the admin last updated. It's very likely that this problem has been fixed in 1.7. Are you able to test your steps with the 1.7.0-alpha1 release to verify that it has been fixed? Thanks in advance! Would I have to change only the client or the server also? Since I can the client easily, however I can't get the server changed to an alpha version... Depending on your operating system there might even be 1.7.0-alpha1 Client OS is Win32, server OS is Linux. binaries available you can use, so you won't have to compile your own. But I'm not sure where to link to because you didn't say which OS you are using. (In the future, please consider including a short line like this in your problem reports: I am using Subversion 1.6.17 on Ubuntu 10.04. Ok, sorry. Thank you, Wolfgang
Re: Problem tagging from mixed rev working copy with a rename (copy+delete) from the past inside
On Thu, Jun 16, 2011 at 11:58:31AM +0200, Wolfgang Röckelein wrote: Stefan Sperling wrote: It's very likely that this problem has been fixed in 1.7. Are you able to test your steps with the 1.7.0-alpha1 release to verify that it has been fixed? Thanks in advance! Would I have to change only the client or the server also? Since I can the client easily, however I can't get the server changed to an alpha version... This is most likely a problem in the working copy, so changing just the client is sufficient. The server doesn't need to be upgraded. It is compatible with any client (sometimes you need to upgrade the server to get access to new features, but in this case that is not relevant). Depending on your operating system there might even be 1.7.0-alpha1 Client OS is Win32, server OS is Linux. You could not find 1.7.0-alpha1 binaries for windows. But there are other pre-release options which match it very closely. In fact they are even more recent than the alpha-1 release so they should have even less known issues ;) Either get the latest package with command line tools from here: http://ctf.open.collab.net/sf/frs/do/viewRelease/projects.csvn/frs.svn_binaries.windows Or you can try the nightly build of tortoise (it uses the same code internally, the only difference is the graphical interface): http://nightlybuilds.tortoisesvn.net/latest/ Thanks for your help! It's great that you can test this.
Re: Problem tagging from mixed rev working copy with a rename (copy+delete) from the past inside
On Thu, Jun 16, 2011 at 12:21:01PM +0200, Stefan Sperling wrote: Thanks for your help! It's great that you can test this. I forgot to mention: Please read the 1.7 release notes, especially the section regarding the change of the working copy format: http://subversion.apache.org/docs/release-notes/1.7.html You should probably run your test on a fresh working copy checked out with the 1.7 client. If you upgrade your existing working copies to 1.7 your 1.6 client will not be able to read them anymore! And you cannot downgrade the format from 1.7 to 1.6.
Re: Evil UTF-8 Character in filename in repo causing issues on my wc
On Wed, Jun 15, 2011 at 11:19 PM, Markus Schaber m.scha...@3s-software.comwrote: Hi, Geoff, Von: Geoff Hoffman [mailto:ghoff...@cardinalpath.com] I have a file with some (I believe) Portuguese characters in the filename that someone managed to store in the repo without any problem, and I checked it out without issues, too. However, now on my working copy, it thinks that file is locally new. Maybe it helps if you use a repo browser to rename the file to an ASCII-Only name directly in the repository? That's all I ever really wanted to do, but I cannot, at least, I don't know how to type the characters in the filename of the file in svn without copy-paste from the svn ls terminal output on Mac OS X, which I think has already converted the filename it just printed, so I get a file not found error when I try to rename or delete it. It may have worked if I had ssh'd into the RHEL server, not sure. It's a bit unclear. I thought of some graphical repository browser (like the one built into TortoiseSVN for example, I guess such things also exist for MacOS), it lets you browse the repository and select the file to rename directly in the repository, without the need of a local checkout / working copy. Yeah, if I had more time I probably should fiddle with it. Our one guy here on Windows using Tortoise has no issues with the same file, so it is indeed a problem specific to Mac, as Stefan pointed out. Given that the issue presents itself in Terminal and NetBeans IDE, it's safe to say any other graphical SVN client on Mac would complain, too, but I didn't test it. IIRC the graphical clients are using the command line under the hood.
Re: Evil UTF-8 Character in filename in repo causing issues on my wc
On Thu, Jun 16, 2011 at 18:24, Geoff Hoffman ghoff...@cardinalpath.com wrote: On Wed, Jun 15, 2011 at 11:19 PM, Markus Schaber m.scha...@3s-software.com wrote: Hi, Geoff, Von: Geoff Hoffman [mailto:ghoff...@cardinalpath.com] I have a file with some (I believe) Portuguese characters in the filename that someone managed to store in the repo without any problem, and I checked it out without issues, too. However, now on my working copy, it thinks that file is locally new. Maybe it helps if you use a repo browser to rename the file to an ASCII-Only name directly in the repository? That's all I ever really wanted to do, but I cannot, at least, I don't know how to type the characters in the filename of the file in svn without copy-paste from the svn ls terminal output on Mac OS X, which I think has already converted the filename it just printed, so I get a file not found error when I try to rename or delete it. It may have worked if I had ssh'd into the RHEL server, not sure. It's a bit unclear. I thought of some graphical repository browser (like the one built into TortoiseSVN for example, I guess such things also exist for MacOS), it lets you browse the repository and select the file to rename directly in the repository, without the need of a local checkout / working copy. Yeah, if I had more time I probably should fiddle with it. Our one guy here on Windows using Tortoise has no issues with the same file, so it is indeed a problem specific to Mac, as Stefan pointed out. Given that the issue presents itself in Terminal and NetBeans IDE, it's safe to say any other graphical SVN client on Mac would complain, too, but I didn't test it. IIRC the graphical clients are using the command line under the hood. On Thu, Jun 16, 2011 at 18:24, Geoff Hoffman ghoff...@cardinalpath.com wrote: On Wed, Jun 15, 2011 at 11:19 PM, Markus Schaber m.scha...@3s-software.com wrote: Hi, Geoff, Von: Geoff Hoffman [mailto:ghoff...@cardinalpath.com] I have a file with some (I believe) Portuguese characters in the filename that someone managed to store in the repo without any problem, and I checked it out without issues, too. However, now on my working copy, it thinks that file is locally new. Maybe it helps if you use a repo browser to rename the file to an ASCII-Only name directly in the repository? That's all I ever really wanted to do, but I cannot, at least, I don't know how to type the characters in the filename of the file in svn without copy-paste from the svn ls terminal output on Mac OS X, which I think has already converted the filename it just printed, so I get a file not found error when I try to rename or delete it. It may have worked if I had ssh'd into the RHEL server, not sure. It's a bit unclear. I thought of some graphical repository browser (like the one built into TortoiseSVN for example, I guess such things also exist for MacOS), it lets you browse the repository and select the file to rename directly in the repository, without the need of a local checkout / working copy. Yeah, if I had more time I probably should fiddle with it. Our one guy here on Windows using Tortoise has no issues with the same file, so it is indeed a problem specific to Mac, as Stefan pointed out. Given that the issue presents itself in Terminal and NetBeans IDE, it's safe to say any other graphical SVN client on Mac would complain, too, but I didn't test it. IIRC the graphical clients are using the command line under the hood. Yes, any graphical client working on a *working copy* on the mac would complain too. But, a hypothetical graphical repo browser that operates directly on the repository isn't effected by HFS+'s unicode normalization. // ben
Re: Evil UTF-8 Character in filename in repo causing issues on my wc
On Thu, Jun 16, 2011 at 11:07 AM, B Smith-Mannschott bsmith.o...@gmail.comwrote: On Thu, Jun 16, 2011 at 18:24, Geoff Hoffman ghoff...@cardinalpath.com wrote: On Wed, Jun 15, 2011 at 11:19 PM, Markus Schaber m.scha...@3s-software.com wrote: Hi, Geoff, Von: Geoff Hoffman [mailto:ghoff...@cardinalpath.com] I have a file with some (I believe) Portuguese characters in the filename that someone managed to store in the repo without any problem, and I checked it out without issues, too. However, now on my working copy, it thinks that file is locally new. Maybe it helps if you use a repo browser to rename the file to an ASCII-Only name directly in the repository? That's all I ever really wanted to do, but I cannot, at least, I don't know how to type the characters in the filename of the file in svn without copy-paste from the svn ls terminal output on Mac OS X, which I think has already converted the filename it just printed, so I get a file not found error when I try to rename or delete it. It may have worked if I had ssh'd into the RHEL server, not sure. It's a bit unclear. I thought of some graphical repository browser (like the one built into TortoiseSVN for example, I guess such things also exist for MacOS), it lets you browse the repository and select the file to rename directly in the repository, without the need of a local checkout / working copy. Yeah, if I had more time I probably should fiddle with it. Our one guy here on Windows using Tortoise has no issues with the same file, so it is indeed a problem specific to Mac, as Stefan pointed out. Given that the issue presents itself in Terminal and NetBeans IDE, it's safe to say any other graphical SVN client on Mac would complain, too, but I didn't test it. IIRC the graphical clients are using the command line under the hood. On Thu, Jun 16, 2011 at 18:24, Geoff Hoffman ghoff...@cardinalpath.com wrote: On Wed, Jun 15, 2011 at 11:19 PM, Markus Schaber m.scha...@3s-software.com wrote: Hi, Geoff, Von: Geoff Hoffman [mailto:ghoff...@cardinalpath.com] I have a file with some (I believe) Portuguese characters in the filename that someone managed to store in the repo without any problem, and I checked it out without issues, too. However, now on my working copy, it thinks that file is locally new. Maybe it helps if you use a repo browser to rename the file to an ASCII-Only name directly in the repository? That's all I ever really wanted to do, but I cannot, at least, I don't know how to type the characters in the filename of the file in svn without copy-paste from the svn ls terminal output on Mac OS X, which I think has already converted the filename it just printed, so I get a file not found error when I try to rename or delete it. It may have worked if I had ssh'd into the RHEL server, not sure. It's a bit unclear. I thought of some graphical repository browser (like the one built into TortoiseSVN for example, I guess such things also exist for MacOS), it lets you browse the repository and select the file to rename directly in the repository, without the need of a local checkout / working copy. Yeah, if I had more time I probably should fiddle with it. Our one guy here on Windows using Tortoise has no issues with the same file, so it is indeed a problem specific to Mac, as Stefan pointed out. Given that the issue presents itself in Terminal and NetBeans IDE, it's safe to say any other graphical SVN client on Mac would complain, too, but I didn't test it. IIRC the graphical clients are using the command line under the hood. Yes, any graphical client working on a *working copy* on the mac would complain too. But, a hypothetical graphical repo browser that operates directly on the repository isn't effected by HFS+'s unicode normalization. // ben Ben, you're right. SVNx doesn't have a rename feature that I could find, but I tried in Versions (demo - w00t) and it worked. Transcript log for repository client [svn+ssh://geoff@mycompany /svn/repos/sites/client/trunk]. Subversion libraries version: 1.6.17 [Jun 16, 12:05:48] Renaming /branches/other/external_docs/Manual_Integração_A_T_2.0.pdf to Manual_Integracao_A_T_2.0.pdf... Committed revision 696 by user geoff. [Jun 16, 12:06:01] Finished operation.
Issue with merge
Hi all. I do a merge between two folders (source) (Ep. svn merge http:xxx/src http:xxx/src) and it works very well (It shows a File1.java with a conflcit -C) Whe and I try do it but directly in this file, the merges doesn't work (Ep. svn merge http:xxx/src/File1.java http:xxx/src/File1.java ).. It doesn't show the conflict, it show -U File1.java!! Help me!! Sorry for my englsih -- Estudiante de Ingenieria de Sistemas e Informatica Univesidad Nacional de Colombia Sede Medellin 2011
Re: Issue with merge
On Thu, Jun 16, 2011 at 02:27:52PM -0500, Henry Piñeros wrote: Hi all. I do a merge between two folders (source) (Ep. svn merge http:xxx/src http:xxx/src) and it works very well (It shows a File1.java with a conflcit -C) Whe and I try do it but directly in this file, the merges doesn't work (Ep. svn merge http:xxx/src/File1.java http:xxx/src/File1.java ).. It doesn't show the conflict, it show -U File1.java!! Hmmm, your problem description is lacking a lot of detail :( I will try to help you anyway: Did you run svn revert -R . on your working copy before repeating the merge? If you did not, then merge tracking might prevent changes from being merged into the file because the file already has them. All you will end up with in this case is probably a mergeinfo change. If your working copy has no local changes (svn diff output is empty) and you don't get any changes merged into your working copy, try this command: svn diff http:xxx/src/File1.java http:xxx/src/File1.java and you will probably see that your merge has an *empty* diff. So there is nothing to merge, and no conflict. The only thing it changes is probably mergeinfo. You probably want something like this instead: cd src/ svn merge -c 42 http:xxx/src/File1.java File1.java or this: cd src/ svn merge http:xxx/src/File1.java@42 http:xxx/src/File1.java@43 File1.java or this (to merge all outstanding changes): cd src/ svn merge http:xxx/src/File1.java File1.java See also: http://svnbook.red-bean.com/nightly/en/svn.branchmerge.advanced.html#svn.branchmerge.advanced.advancedsyntax And this: http://mail-archives.apache.org/mod_mbox/subversion-users/201103.mbox/%3c20110308203505.gb19...@jack.stsp.name%3E
Re: Issue with merge
Thanks Stefan!!. Yes, I do svn revert -R or do a new checkout!!! The problem is whenI try do a mergen on file level, but if I do it on folder lever(parent folder of that file), It works :( On Thu, Jun 16, 2011 at 3:10 PM, Stefan Sperling s...@elego.de wrote: On Thu, Jun 16, 2011 at 02:27:52PM -0500, Henry Piñeros wrote: Hi all. I do a merge between two folders (source) (Ep. svn merge http:xxx/src http:xxx/src) and it works very well (It shows a File1.java with a conflcit -C) Whe and I try do it but directly in this file, the merges doesn't work (Ep. svn merge http:xxx/src/File1.java http:xxx/src/File1.java ).. It doesn't show the conflict, it show -U File1.java!! Hmmm, your problem description is lacking a lot of detail :( I will try to help you anyway: Did you run svn revert -R . on your working copy before repeating the merge? If you did not, then merge tracking might prevent changes from being merged into the file because the file already has them. All you will end up with in this case is probably a mergeinfo change. If your working copy has no local changes (svn diff output is empty) and you don't get any changes merged into your working copy, try this command: svn diff http:xxx/src/File1.java http:xxx/src/File1.java and you will probably see that your merge has an *empty* diff. So there is nothing to merge, and no conflict. The only thing it changes is probably mergeinfo. You probably want something like this instead: cd src/ svn merge -c 42 http:xxx/src/File1.java File1.java or this: cd src/ svn merge http:xxx/src/File1.java@42 http:xxx/src/file1.j...@43file1.java or this (to merge all outstanding changes): cd src/ svn merge http:xxx/src/File1.java File1.java See also: http://svnbook.red-bean.com/nightly/en/svn.branchmerge.advanced.html#svn.branchmerge.advanced.advancedsyntax And this: http://mail-archives.apache.org/mod_mbox/subversion-users/201103.mbox/%3c20110308203505.gb19...@jack.stsp.name%3E -- Estudiante de Ingenieria de Sistemas e Informatica Univesidad Nacional de Colombia Sede Medellin 2011
Re: Issue with merge
Can you try it in your computer ? A simple example!!! ( a flder with two files) On Thu, Jun 16, 2011 at 3:36 PM, Henry Piñeros hapiner...@gmail.com wrote: Thanks Stefan!!. Yes, I do svn revert -R or do a new checkout!!! The problem is whenI try do a mergen on file level, but if I do it on folder lever(parent folder of that file), It works :( On Thu, Jun 16, 2011 at 3:10 PM, Stefan Sperling s...@elego.de wrote: On Thu, Jun 16, 2011 at 02:27:52PM -0500, Henry Piñeros wrote: Hi all. I do a merge between two folders (source) (Ep. svn merge http:xxx/src http:xxx/src) and it works very well (It shows a File1.java with a conflcit -C) Whe and I try do it but directly in this file, the merges doesn't work (Ep. svn merge http:xxx/src/File1.java http:xxx/src/File1.java ).. It doesn't show the conflict, it show -U File1.java!! Hmmm, your problem description is lacking a lot of detail :( I will try to help you anyway: Did you run svn revert -R . on your working copy before repeating the merge? If you did not, then merge tracking might prevent changes from being merged into the file because the file already has them. All you will end up with in this case is probably a mergeinfo change. If your working copy has no local changes (svn diff output is empty) and you don't get any changes merged into your working copy, try this command: svn diff http:xxx/src/File1.java http:xxx/src/File1.java and you will probably see that your merge has an *empty* diff. So there is nothing to merge, and no conflict. The only thing it changes is probably mergeinfo. You probably want something like this instead: cd src/ svn merge -c 42 http:xxx/src/File1.java File1.java or this: cd src/ svn merge http:xxx/src/File1.java@42 http:xxx/src/file1.j...@43file1.java or this (to merge all outstanding changes): cd src/ svn merge http:xxx/src/File1.java File1.java See also: http://svnbook.red-bean.com/nightly/en/svn.branchmerge.advanced.html#svn.branchmerge.advanced.advancedsyntax And this: http://mail-archives.apache.org/mod_mbox/subversion-users/201103.mbox/%3c20110308203505.gb19...@jack.stsp.name%3E -- Estudiante de Ingenieria de Sistemas e Informatica Univesidad Nacional de Colombia Sede Medellin 2011 -- Estudiante de Ingenieria de Sistemas e Informatica Univesidad Nacional de Colombia Sede Medellin 2011
Re: Issue with merge
On 2011-06-16 22:37, Henry Piñeros wrote: Can you try it in your computer ? A simple example!!! ( a flder with two files) [...] Henry, please tell us _exactly_ what you did; that is, the sequence of Subversion commands, and their output, if any. Cut and paste from the command line window. Then indicate where and when Subversion didn't work as you expected, and why you think it is not working right. By doing that, you very much increase the chances of getting the answer you are looking for. Also, if people agree that there is a problem, you actually contributed a test case for the Subversion test suite! Thanks. -- Michael Diers, elego Software Solutions GmbH, http://www.elego.de signature.asc Description: OpenPGP digital signature
Re: Problem tagging from mixed rev working copy with a rename (copy+delete) from the past inside
Hi Stefan, Stefan Sperling wrote: On Thu, Jun 16, 2011 at 12:21:01PM +0200, Stefan Sperling wrote: Thanks for your help! It's great that you can test this. I forgot to mention: Please read the 1.7 release notes, especially the section regarding the change of the working copy format: http://subversion.apache.org/docs/release-notes/1.7.html You should probably run your test on a fresh working copy checked out I will zip the wc first, so I can restore the current state. Checkout won't help me here, since it is a mixed rev wc and the problems are because of the mixed rev! with the 1.7 client. If you upgrade your existing working copies to 1.7 your 1.6 client will not be able to read them anymore! And you cannot downgrade the format from 1.7 to 1.6. Thank you, Wolfgang
Re: Using SVN to develop a website
On 2011-06-13 16:13, Andy Levy wrote: [...] Be advised that there are security fixes included in later 1.5.x releases in addition to the usual bug fixes, and when Subversion 1.7 is released (the first alpha came out a few days ago) support for 1.5.x will end. Debian have a policy to backport critical security fixes to the Subversion package in their supported OS releases - as do Ubuntu, RedHat, SUSE, and others. Hence there is no need to panic, Debian lenny won't reach EOL till 2012-04, cf. http://en.wikipedia.org/wiki/Debian. That said, there is merit in having a more up-to-date Subversion release installed. For Debian, try backports.debian.org (shameless plug). -- Michael Diers, elego Software Solutions GmbH, http://www.elego.de signature.asc Description: OpenPGP digital signature
Problem Loading Huge Repository
Hi, As part of the work of my PhD thesis I need to load the ASF Subversion repository into my own local repository in order to mine and extract information from the repository without overloading the ASF servers. I have downloaded the repository dump and started loading it into my own repository. But the repository is huge (~45GB), and loading it using 'svnadmin load' will take me days (~15). I tried 'svndumpfilter' to filter out some projects but I get the error 'svndumpfilter: Unsupported dumpfile version: 3'. I'm using 'svndumpfilter' version 1.6.12. Is there any way to overcome this error? Do you know any faster way to load the dump file or to filter out some projects/revisions so I can speed up the process? Thank you in advance. Best regards, Bruno Antunes
issue #3264
I have some information on this issue.
http://subversion.tigris.org/issues/show_bug.cgi?id=3264
(Hoping we could get a fix for this. The workaround is not really okay for
automatic scripts).
Running svn client either from cli (cygwin) (or from gui: tortioise-svn) from
relatively slow VMs.
A relatively large repository is being checked out. VM is slow, and there are
lots of instances where
svn client TCP windows goes to zero, and then opens up again. (As against a
relatively fast client, where
such fluctuations were not seen). client setting: http-timeout = 1800. This
is from a cli/cygwin client:
wireshark capture: (last few packets) client
(172.17.37.63) and subversion server (10.74.40.232)
PKT#Time (seconds) SRC SSDST DS PROTO
LEN
-- - --
64459936.01842710.74.40.23280172.17.37.6350798HTTP
1434 Continuation or non-HTTP traffic
64460936.01842910.74.40.23280172.17.37.6350798HTTP
115Continuation or non-HTTP traffic
64461936.018441172.17.37.635079810.74.40.23280TCP54
50798 80 [ACK] Seq=6565 Ack=65979260 Win=20474 Len=0
64462938.661108172.17.37.635079810.74.40.23280TCP54
[TCP Window Update] 50798 80 [ACK] Seq=6565 Ack=65979260 Win=65535 Len=0
64463940.355624172.17.37.635079810.74.40.23280TCP54
50798 80 [FIN, ACK] Seq=6565 Ack=65979260 Win=65535 Len=0
--
Client bails out saying:
svn: REPORT of '/xxx/yyy/!svn/vcc/default': Could not read response body:
connection was closed by server (http://subversion.xx.com)
Clearly, this client is not waiting enough for the server to send more data.
There is a delay of about half a second where nothing is received from the
server. After the second ACK from client (172.17.37.63) to subversion server
(10.74.40.232) the next packet is has a FIN..! Server has been silent
for approximately 4 seconds in the end --whether it reset or is just preparing
data to send I can not say, though server apache error-logs have errors showing
it could not write base64 data, but that could be the result of this client
sending a FIN. After all, server did not close the TCP connection.
In some prior runs, where I captured the whole session, the gap between server'
last data packet and svn client sending a FIN is much smaller (0.05 seconds,
approx):
33494647.94420810.74.40.23280172.17.37.6350167HTTP
883Continuation or non-HTTP traffic
33495647.944218172.17.37.635016710.74.40.23280TCP54
50167 80 [ACK] Seq=6564 Ack=50422857 Win=24686 Len=0
33496647.948777172.17.37.635016710.74.40.23280TCP54
[TCP Window Update] 50167 80 [ACK] Seq=6564 Ack=50422857 Win=28158 Len=0
33497647.949267172.17.37.635016710.74.40.23280TCP54
[TCP Window Update] 50167 80 [ACK] Seq=6564 Ack=50422857 Win=65535 Len=0
33498647.996754172.17.37.635016710.74.40.23280TCP54
50167 80 [FIN, ACK] Seq=6564 Ack=50422857 Win=65535 Len=0
bash-3.2$ svn --version
svn, version 1.6.11 (r934486)
compiled Apr 19 2010, 12:23:49
Copyright (C) 2000-2009 CollabNet.
Subversion is open source software, see http://subversion.tigris.org/
This product includes software developed by CollabNet (http://www.Collab.Net/).
The following repository access (RA) modules are available:
* ra_neon : Module for accessing a repository via WebDAV protocol using Neon.
- handles 'http' scheme
- handles 'https' scheme
* ra_svn : Module for accessing a repository using the svn network protocol.
- with Cyrus SASL authentication
- handles 'svn' scheme
* ra_local : Module for accessing a repository on local disk.
- handles 'file' scheme
* ra_serf : Module for accessing a repository via WebDAV protocol using serf.
- handles 'http' scheme
- handles 'https' scheme
Thank you.
Re: Problem Loading Huge Repository
On Thu, Jun 16, 2011 at 4:05 PM, Bruno Antunes b...@dei.uc.pt wrote: Hi, As part of the work of my PhD thesis I need to load the ASF Subversion repository into my own local repository in order to mine and extract information from the repository without overloading the ASF servers. I have downloaded the repository dump and started loading it into my own repository. But the repository is huge (~45GB), and loading it using 'svnadmin load' will take me days (~15). I tried 'svndumpfilter' to filter out some projects but I get the error 'svndumpfilter: Unsupported dumpfile version: 3'. I'm using 'svndumpfilter' version 1.6.12. Is there any way to overcome this error? Do you know any faster way to load the dump file or to filter out some projects/revisions so I can speed up the process? Thank you in advance. Best regards, Bruno Antunes Just a thought... Do you need the revision history or only the current (head) revision? Guessing if you do not need the revision history then it will be much smaller and faster to svn export their-stuff -r HEAD
Re: Problem Loading Huge Repository
On Jun 17, 2011, at 24:59 , Geoff Hoffman wrote: On Thu, Jun 16, 2011 at 4:05 PM, Bruno Antunes b...@dei.uc.pt wrote: Hi, As part of the work of my PhD thesis I need to load the ASF Subversion repository into my own local repository in order to mine and extract information from the repository without overloading the ASF servers. I have downloaded the repository dump and started loading it into my own repository. But the repository is huge (~45GB), and loading it using 'svnadmin load' will take me days (~15). I tried 'svndumpfilter' to filter out some projects but I get the error 'svndumpfilter: Unsupported dumpfile version: 3'. I'm using 'svndumpfilter' version 1.6.12. Is there any way to overcome this error? Do you know any faster way to load the dump file or to filter out some projects/revisions so I can speed up the process? Thank you in advance. Best regards, Bruno Antunes Just a thought... Do you need the revision history or only the current (head) revision? Guessing if you do not need the revision history then it will be much smaller and faster to svn export their-stuff -r HEAD I need the entire revision history, because I need to extract historical information from the repository. But I could use the revision history from specific projects only, I don't need the entire repository, which contains all the ASF projects. The problem is I can filter these projects in the dump file. Best regards, Bruno Antunes
Re: Problem Loading Huge Repository
Um... separate revision range at a time... -r 6000:HEAD ? only individual directories at a time... path/to/dir -r 6000:HEAD ? Or... This is a bit out there but you could spin up and install subversion on a 4XL amazon EC2 instance, import it on this very, very fast (virtual) machine, then the moment it is done, tar up the repository directory, download it and use that... with that said that will probably be fairly expensive to do but it will save you a lot of time. If money is no object get a maxed out quad G5 with 64GB of memory. The ASF will fit in ram. There's a financial solution to every problem. On Thu, Jun 16, 2011 at 5:08 PM, Bruno Antunes b...@dei.uc.pt wrote: On Jun 17, 2011, at 24:59 , Geoff Hoffman wrote: On Thu, Jun 16, 2011 at 4:05 PM, Bruno Antunes b...@dei.uc.pt wrote: Hi, As part of the work of my PhD thesis I need to load the ASF Subversion repository into my own local repository in order to mine and extract information from the repository without overloading the ASF servers. I have downloaded the repository dump and started loading it into my own repository. But the repository is huge (~45GB), and loading it using 'svnadmin load' will take me days (~15). I tried 'svndumpfilter' to filter out some projects but I get the error 'svndumpfilter: Unsupported dumpfile version: 3'. I'm using 'svndumpfilter' version 1.6.12. Is there any way to overcome this error? Do you know any faster way to load the dump file or to filter out some projects/revisions so I can speed up the process? Thank you in advance. Best regards, Bruno Antunes Just a thought... Do you need the revision history or only the current (head) revision? Guessing if you do not need the revision history then it will be much smaller and faster to svn export their-stuff -r HEAD I need the entire revision history, because I need to extract historical information from the repository. But I could use the revision history from specific projects only, I don't need the entire repository, which contains all the ASF projects. The problem is I can filter these projects in the dump file. Best regards, Bruno Antunes
Re: Issue with merge
This is my case!!! 1. I do a copyTo() from my trunk to a branch (branchPrueba). 2. I do a checkout from branchPrueba (C:/Prueba), I modify a file (Hola1.java) and after I do commite it. 3. I do a checkout from trunk (C:/Trunk), I modify a file (Hola1.java) and after I do commite it. 4. Run cmd, then… cd C:/Trunk/src 5. svn merge *https**:// example-test-project.googlecode.com/svn/trunk/src/Hola1.java* *https**:// example-test-project.googlecode.com/svn/branches/branchPrueba/src/Hola1.java * --Merge difference… U Hola1.java 6. I drop C:/Trunk (I didn’t commit it). 7. Again, I do a checkout from trunk (C:/Trunk). 8. svn merge *https**://example-test-project.googlecode.com/svn/trunk/src/* *https**:// example-test-project.googlecode.com/svn/branches/branchPrueba/src/* C Hola1.java … Shows a message to resolve conflict between fonts Tomorrow, I going to post here!! (with images) Thank before hands ... I forget this!! I do merge between the files .java with tortoise which work very well.. It show the copnflict 2011/6/16 Michael Diers mdi...@elegosoft.com On 2011-06-16 22:37, Henry Piñeros wrote: Can you try it in your computer ? A simple example!!! ( a flder with two files) [...] Henry, please tell us _exactly_ what you did; that is, the sequence of Subversion commands, and their output, if any. Cut and paste from the command line window. Then indicate where and when Subversion didn't work as you expected, and why you think it is not working right. By doing that, you very much increase the chances of getting the answer you are looking for. Also, if people agree that there is a problem, you actually contributed a test case for the Subversion test suite! Thanks. -- Michael Diers, elego Software Solutions GmbH, http://www.elego.de -- Estudiante de Ingenieria de Sistemas e Informatica Univesidad Nacional de Colombia Sede Medellin 2011
