Re: How to revert a --record-only svn merge before a commit
On 29/10/13 05:38, Zk W wrote: Hi All We use SVN 1.6 How do we perform a svn merge revert of a revision number that is --record-only in linux shell before a svn commit ? We perform svn merge --record-only -c 1234 http://testsomething.com We like to revert that step. Thank you Sincerely That only changes the svn:mergeinfo property, so I would suggest editing it. Since you did not have a target in the command you showed us I guess it was the current directory (unless you simply omitted it for simplicity), which I hope is the root of your WC (it should always be the root of your WC, it makes things much easier). So, in the root of your WC run this command svn pe svn:mergeinfo . and delete the info for revision 1234 (which again I guess it's not the real one :-) Hope this helps. Giulio
Re: How to revert a --record-only svn merge before a commit
On 29/10/13 10:43, Stefan Sperling wrote: On Tue, Oct 29, 2013 at 09:10:45AM +, Giulio Troccoli wrote: On 29/10/13 05:38, Zk W wrote: Hi All We use SVN 1.6 How do we perform a svn merge revert of a revision number that is --record-only in linux shell before a svn commit ? We perform svn merge --record-only -c 1234 http://testsomething.com We like to revert that step. Thank you Sincerely That only changes the svn:mergeinfo property, so I would suggest editing it. Since you did not have a target in the command you showed us I guess it was the current directory (unless you simply omitted it for simplicity), which I hope is the root of your WC (it should always be the root of your WC, it makes things much easier). So, in the root of your WC run this command svn pe svn:mergeinfo . and delete the info for revision 1234 (which again I guess it's not the real one :-) Hope this helps. Giulio I would advise against editing or deleting mergeinfo. Instead, run the same merge in reverse: svn merge --record-only -c -1234 http://testsomething.com Note the minus in front of 1234. This approach will also fix up subtree mergeinfo, if any. Ah yes, of course. I didn't use the merge command because the OP said how to reverse before the commit and there could be other merges that he wants to keep. I didn't think of using --record-only with a reverse merge, but it make sense Giulio
Re: Planning a SVN upgrade
On 23/08/13 21:09, Maureen Barger wrote: Hi - I am currently planning an upgrade from SVN 1.5 (using svnserve and ssh tunnel) to SVN 1.8.1 fronted with Apache and webdav using AD for authNz. We have about 50 repos. I'll be moving from an older Ubuntu 8 install to Centos 6 x64. My thought was I could upgrade the SVN installation in place, bringing the repo up to 1.8 and then dump those repos and bring them online in the new environment. We currently use Eclipse as our IDE and Jenkins as our CI tool with Nexus as the object repo. I was thinking to leave the upgrade of Eclipse client and svnkit to the indiviidual so they can decide what direction to take with their working copies et al. I do not foresee any changes I would need to make to Jenkins or Nexus. Has anyone made a jump this large before? Any comments about my upgrade plan? Thanks! Being a totally new server, may I suggest using svnsync instead of a dump/load cycle? It's very easy to set up, you can still use the old repositories while syncing and if you take care of using the same UUID on the new repository you might even be able to make the switch completely transparent to the clients. I did an upgrade about three years ago, I think from 1.4 to 1.6, and I used svnsync. It worked very well. I don't share others' concerns about not upgrading the repository (which will happen if you use svnsync). I don't see why now. Besides, using svnsync, you don't touch the old repositories at all so you still have the old format repos if you need them. Just my 2p
Re: svn diff outout
On 30/10/12 15:39, Ahmed, Omair (GE Oil Gas) wrote: Hello, Is there a way to get (via cmd line) a list of files that have changed between revisions, instead of the content of the files? svn log -v
Re: UNSUBSCRIBE
For the very useful Welcome message... Please save this message so that you know the address you are subscribed under, in case you later want to unsubscribe or change your subscription address. To remove your address from the list, send a message to: users-unsubscr...@subversion.apache.org On 11/10/12 12:43, Fernando Gomes wrote: Fernando M. A. Gomes
Re: UNSUBSCRIBE
For the very useful Welcome message... Please save this message so that you know the address you are subscribed under, in case you later want to unsubscribe or change your subscription address. To remove your address from the list, send a message to: users-unsubscr...@subversion.apache.org On 11/10/12 14:44, anubhav prabakar wrote: Anubhav Prabakar
Re: Problem with merging
On 12/09/12 18:39, John Maher wrote: Hello [CUT] Can you please stop reusing an already existing thread and instead start a new one for a new question? Thanks John Thanks Giulio
Re: Problem with merging
On 13/09/12 15:26, John Maher wrote: Yes that is what I did. Now that I know that causes problems with the subversion mailing list I won't do it again. John Thank you Giulio
Re: 'svn incoming'
On 08/05/12 15:33, anatoly techtonik wrote: Hi, Mercurial has a very convenient command hg incoming which is basically what's new for incoming changes. Will it be nice to add the same capability to Subversion? `svn log -r BASE:HEAD' works ok, but not everybody proficient enough to know about it. Please, CC. -- anatoly t. I don't know Mercurial, but maybe 'svn st -u' would do what you want?
Re:
On 23/04/12 12:20, Piet Arickx wrote: Is there any way to get all log messages between date x and date y. We would like to get an overview of all log messages between to the two dates, is this possible ? Use the --revision option with date in {}, e.g. svn log --revision{2012-01-01}:{2012-02-01} to get all last January's log.
Re:
On 23/04/12 12:28, Piet Arickx wrote: Ok, I will try this later, the svn environment itself isn't installed yet, but thank you for your quick answer. We are actually testing and evaluating tortoise svn, do you know if it's possible to do the same thing using this gui ? Piet. Please do not top-post and remember to reply-to-all, so that the thread stays on the list. Unfortunately I do not use TortoiseSVN, but as this is a pretty basic function I would guess that yes it is possible with TortoiseSVN too. -Original Message- From: Giulio Troccoli [mailto:giulio.trocc...@mediatelgroup.co.uk] Sent: maandag 23 april 2012 13:24 To: Piet Arickx Cc: users@subversion.apache.org Subject: Re: On 23/04/12 12:20, Piet Arickx wrote: Is there any way to get all log messages between date x and date y. We would like to get an overview of all log messages between to the two dates, is this possible ? Use the --revision option with date in {}, e.g. svn log --revision{2012-01-01}:{2012-02-01} to get all last January's log.
Re: svnsync: Error while replaying commit
On 02/04/12 08:27, Gary wrote: - Original Message - From: Henrik Sundberg Do you have a precommit hook now that was not there when revs 81-82 were committed? There are no hooks as far as I know. (I'm not an admin, and the admin is not very forthcoming on.. well, anything, really). Svn log will show the revisions whereever in the repository they were made. Are they missing for real? Yes the revisions are really missing: $ svn log Did you run svn log on the working copy? I ask because it's really strange that two revisions are missing so maybe they have been made on a different part of the repository. I would suggest running svn info to get the correct repository URL and then run svn log against that URL. [snip] r83 | gpspbu | 2011-06-24 12:34:38 +0200 (Fri, 24 Jun 2011) | 1 line added missing file r80 | gpspbu | 2011-06-23 16:23:46 +0200 (Thu, 23 Jun 2011) | 1 line Added WP31 r79 | gpspbu | 2011-06-23 15:58:15 +0200 (Thu, 23 Jun 2011) | 1 line Added a PhoneNumberUnlocker On Fri, Mar 30, 2012 at 15:25, Garylistgj-...@yahoo.co.uk wrote: I see a lot of reports of this error, but little in the way of clear information as to what it might mean, or how to fix it: $ svnsync sync file://`pwd`/dest Committed revision 1. Copied properties for revision 1. Transmitting file data . [...] Committed revision 79. Copied properties for revision 79. Transmitting file data ... Committed revision 80. Copied properties for revision 80. svnsync: Error while replaying commit Huh? If I look at the source server log, revs 81 82 are missing in the trunk. I imagine they are/were in a branch, which AFAIK is no longer available. Is there any way to get around this? Assuming that's the problem, of course.
Re: svnsync: Error while replaying commit
On 02/04/12 10:24, Gary wrote: From: Giulio Troccoli On 02/04/12 08:27, Gary wrote: - Original Message - From: Henrik Sundberg Do you have a precommit hook now that was not there when revs 81-82 were committed? There are no hooks as far as I know. (I'm not an admin, and the admin is not very forthcoming on.. well, anything, really). Svn log will show the revisions whereever in the repository they were made. Are they missing for real? Yes the revisions are really missing: $ svn log Did you run svn log on the working copy? I ask because it's really strange that two revisions are missing so maybe they have been made on a different part of the repository. I would suggest running svn info to get the correct repository URL and then run svn log against that URL. Hmm. Yeah, I ran it on a working copy, just based on what Henrik said. I wasn't really thinking (being on call will do that to a chap)... Sorry. This is perhaps better: $ svn log svn://devel.domain/repo/ [snip] r84 | gpspbu | 2011-06-24 12:52:16 +0200 (Fri, 24 Jun 2011) | 1 line merged trunk to branch r83 | gpspbu | 2011-06-24 12:34:38 +0200 (Fri, 24 Jun 2011) | 1 line added missing file r82 | ggapbu | 2011-06-23 17:58:49 +0200 (Thu, 23 Jun 2011) | 1 line test r81 | gpspbu | 2011-06-23 17:48:03 +0200 (Thu, 23 Jun 2011) | 1 line Created a branch working of /repo/trunk. r80 | gpspbu | 2011-06-23 16:23:46 +0200 (Thu, 23 Jun 2011) | 1 line Added WP31 [snip] But that still doesn't explain to me why svnsync barfs on those (not) missing revisions. Looking at the command line history, I can't see anywhere where I pointed svnsync at just the trunk, only ever at the repo/project within the repo (I took my instructions from http://svn.apache.org/repos/asf/subversion/trunk/notes/svnsync.txt) Well, at least we know that the revisions are not missing. Can you show us the source repository path for you synced repo? It should be in one of the properties stored in revision 0 in the synced repo, if I remember well. Also, can you run svn log -v on revision 80, 81 and 82? On Fri, Mar 30, 2012 at 15:25, Garylistgj-...@yahoo.co.uk wrote: I see a lot of reports of this error, but little in the way of clear information as to what it might mean, or how to fix it: $ svnsync sync file://`pwd`/dest Committed revision 1. Copied properties for revision 1. Transmitting file data . [...] Committed revision 79. Copied properties for revision 79. Transmitting file data ... Committed revision 80. Copied properties for revision 80. svnsync: Error while replaying commit Huh? If I look at the source server log, revs 81 82 are missing in the trunk. I imagine they are/were in a branch, which AFAIK is no longer available. Is there any way to get around this? Assuming that's the problem, of course. - Original Message -
Re: svnsync: Error while replaying commit
On 02/04/12 11:10, Gary wrote: - Original Message - From: Giulio Troccoli On 02/04/12 10:24, Gary wrote: This is perhaps better: $ svn log svn://devel.domain/repo/ [snip] r84 | gpspbu | 2011-06-24 12:52:16 +0200 (Fri, 24 Jun 2011) | 1 line merged trunk to branch r83 | gpspbu | 2011-06-24 12:34:38 +0200 (Fri, 24 Jun 2011) | 1 line added missing file r82 | ggapbu | 2011-06-23 17:58:49 +0200 (Thu, 23 Jun 2011) | 1 line test r81 | gpspbu | 2011-06-23 17:48:03 +0200 (Thu, 23 Jun 2011) | 1 line Created a branch working of /repo/trunk. r80 | gpspbu | 2011-06-23 16:23:46 +0200 (Thu, 23 Jun 2011) | 1 line Added WP31 [snip] But that still doesn't explain to me why svnsync barfs on those (not) missing revisions. Looking at the command line history, I can't see anywhere where I pointed svnsync at just the trunk, only ever at the repo/project within the repo (I took my instructions from http://svn.apache.org/repos/asf/subversion/trunk/notes/svnsync.txt) Well, at least we know that the revisions are not missing. Can you show us the source repository path for you synced repo? It should be in one of the properties stored in revision 0 in the synced repo, if I remember well. Do you mean in the properties of the one I am trying to sync into, or from?I'm not really sure what you mean :P Sorry, I wasn't very clear. The one your syncing into, so the destination repo. Also, can you run svn log -v on revision 80, 81 and 82? [11:41:02] jg@ggajg ~/.tmp $ svn log -v -r80 svn://devel.domain/repo/branches/working r80 | gpspbu | 2011-06-23 16:23:46 +0200 (Thu, 23 Jun 2011) | 1 line Changed paths: M /trunk/030-Quellcode/[snip] A /trunk/030-Quellcode/[snip] [snip other source code files] Added WP31 Why is it showing files in trunk when you're log command is for branches/working ? Or have you just pasted the wrong command? [11:41:08] jg@ggajg ~/.tmp $ svn log -v -r81 svn://devel.domain/repo/branches/working r81 | gpspbu | 2011-06-23 17:48:03 +0200 (Thu, 23 Jun 2011) | 1 line Changed paths: A /branches/working (from /trunk:80) Created a branch working of /repo/trunk. [11:41:21] jg@ggajg ~/.tmp $ svn log -v -r82 svn://devel.domain/repo/branches/working r82 | ggapbu | 2011-06-23 17:58:49 +0200 (Thu, 23 Jun 2011) | 1 line Changed paths: A /branches/working/030-Quellcode/GPSAssemblies/test.txt test
Re: svnsync: Error while replaying commit
On 02/04/12 11:51, Gary wrote: - Original Message - From: Giulio Troccoli On 02/04/12 11:10, Gary wrote: - Original Message - From: Giulio Troccoli On 02/04/12 10:24, Gary wrote: that still doesn't explain to me why svnsync barfs on those (not) missing revisions. Looking at the command line history, I can't see anywhere where I pointed svnsync at just the trunk, only ever at the repo/project within the repo (I took my instructions from http://svn.apache.org/repos/asf/subversion/trunk/notes/svnsync.txt) Well, at least we know that the revisions are not missing. Can you show us the source repository path for you synced repo? It should be in one of the properties stored in revision 0 in the synced repo, if I remember well. Do you mean in the properties of the one I am trying to sync into, or from?I'm not really sure what you mean :P Sorry, I wasn't very clear. The one your syncing into, so the destination repo. No problem. I don't know if this is exactly what you want, but: $ cat ./db/revprops/0/0 K 8 svn:date V 27 2011-03-01T16:14:38.678110Z K 17 svn:sync-from-url V 33 svn://devel.domain/repo K 18 svn:sync-from-uuid V 36 7c76b8fe-c8ee-45e6-8ede-b17e10a7e991 K 24 svn:sync-last-merged-rev V 1 0 END So you mean the sync-from-url property? That looks correct, to me (with my admittedly limited knowledge) Well, I would have used svn pl -r0 repo to get the list of props (I didn't remember its name) and then svn pg svn:sync-from-url -r0 repo but I guess it's the same thing. It looks like you're syncing the whole repo. I was just checking :-) Howeve, why is svn:sync-last-merged-rev 0? It should be, well, the last merged revision, 79 I think. I guess svn pg svn:sync-last-merged-rev shows 0 as well? Also, can you run svn log -v on revision 80, 81 and 82? [11:41:02] jg@ggajg ~/.tmp $ svn log -v -r80 svn://devel.domain/repo/branches/working r80 | gpspbu | 2011-06-23 16:23:46 +0200 (Thu, 23 Jun 2011) | 1 line Changed paths: M /trunk/030-Quellcode/[snip] A /trunk/030-Quellcode/[snip] [snip other source code files] Added WP31 Why is it showing files in trunk when you're log command is for branches/working ? Or have you just pasted the wrong command? Nope, that's the command. I mean, it *is* the log, so... shouldn't it? The commands for trunk and branch produce the same output, anyway: [12:39:07] jg@ggajg ~/.tmp $ svn log -v -r80 svn://devel.domain/repo/trunk trunk ; svn log -v -r80 svn://devel.domain/repo/branches/working branch [12:39:26] jg@ggajg ~/.tmp $ diff -q trunk branch [12:39:29] jg@ggajg ~/.tmp What version of SVN are you using? I've got 1.6.12 and if I am in a directory where no changes were made for a revision then svn log doesn't show anything, e.g. svn log -v -r17727 In the list of files changed in revision 80 that you posted earlier, are there any files at all that are actually in branches/working?
Re: svnsync: Error while replaying commit
On 02/04/12 13:16, Gary wrote: - Original Message - From: Giulio Troccoli On 02/04/12 11:51, Gary wrote: - Original Message - From: Giulio Troccoli On 02/04/12 11:10, Gary wrote: - Original Message - From: Giulio Troccoli On 02/04/12 10:24, Gary wrote: that still doesn't explain to me why svnsync barfs on those (not) missing revisions. Looking at the command line history, I can't see anywhere where I pointed svnsync at just the trunk, only ever at the repo/project within the repo (I took my instructions from http://svn.apache.org/repos/asf/subversion/trunk/notes/svnsync.txt) Well, at least we know that the revisions are not missing. Can you show us the source repository path for you synced repo? It should be in one of the properties stored in revision 0 in the synced repo, if I remember well. Do you mean in the properties of the one I am trying to sync into, or from?I'm not really sure what you mean :P Sorry, I wasn't very clear. The one your syncing into, so the destination repo. No problem. I don't know if this is exactly what you want, but: $ cat ./db/revprops/0/0 K 8 svn:date V 27 2011-03-01T16:14:38.678110Z K 17 svn:sync-from-url V 33 svn://devel.domain/repo K 18 svn:sync-from-uuid V 36 7c76b8fe-c8ee-45e6-8ede-b17e10a7e991 K 24 svn:sync-last-merged-rev V 1 0 END So you mean the sync-from-url property? That looks correct, to me (with my admittedly limited knowledge) Well, I would have used svn pl -r0repo to get the list of props (I didn't remember its name) and then svn pg svn:sync-from-url -r0repo but I guess it's the same thing. It looks like you're syncing the whole repo. I was just checking :-) Okay :) Howeve, why is svn:sync-last-merged-rev 0? It should be, well, the last merged revision, 79 I think. I guess svn pg svn:sync-last-merged-rev shows 0 as well? Oh, simply because I removed that (destination) repo once it was clear it was not correct. I then recreated it this morning in order to perform one or other operation you or someone else asked me to do. If I do it now (having tried to sync again), I get: $ cat db/revprops/0/0 K 8 svn:date V 27 2011-03-01T16:14:38.678110Z K 26 svn:sync-currently-copying V 2 81 K 17 svn:sync-from-url V 33 svn://devel.domain/repo K 18 svn:sync-from-uuid V 36 7c76b8fe-c8ee-45e6-8ede-b17e10a7e991 K 24 svn:sync-last-merged-rev V 2 80 END as you expected. Why is it showing files in trunk when you're log command is for branches/working ? Or have you just pasted the wrong command? Nope, that's the command. I mean, it *is* the log, so... shouldn't it? The commands for trunk and branch produce the same output, anyway: [12:39:07] jg@ggajg ~/.tmp $ svn log -v -r80 svn://devel.domain/repo/trunk trunk ; svn log -v -r80 svn://devel.domain/repo/branches/working branch [12:39:26] jg@ggajg ~/.tmp $ diff -q trunk branch [12:39:29] jg@ggajg ~/.tmp What version of SVN are you using? I've got 1.6.12 and if I am in a directory where no changes were made for a revision then svn log doesn't show anything,e.g. svn log -v -r17727 $ svn --version svn, version 1.6.17 (r1128011) compiled Jun 2 2011, 10:39:28 I'm not 100% sure what the server version is. In the list of files changed in revision 80 that you posted earlier, are there any files at all that are actually in branches/working? No, all are in trunk. That is really baffling me. But mayber that's because you have different version. I just thought something else. svnsync stops when trying to create the branch (rev 81). So maybe the error is something not related to the repository, like permission (I don't think so though) or some hooks. Sorry, I am a bit to a dead end here.
Re: Quirk with svn:ignore
On 19/03/12 16:26, Geoff Hoffman wrote: I ran into an unexpected behavior with svn:ignore today and wanted to see if someone can verify whether this is a bug (in the current version) or just an aspect of how Subversion works. We're still on 1.6x. Given a tree with trunk + cache + htdocs + logs + system I have tried putting cd trunk svn propset svn:ignore logs/* . ...ignore everything in the /logs/ directory, but the svn:ignore propset is on /trunk/. This doesn't work -- that is, log files are not ignored as expected, but shown as new files when running the project and svn status Do you mean that the files are shown with an A in the first column? If so, I don't think Subversion should ignore something that has been specifically added. Try to revert the addition, svn revert --depth infinity logs, and then set the svn:ignore property again. Giulio
Re: Quirk with svn:ignore
On 19/03/12 17:11, Geoff Hoffman wrote: On Mon, Mar 19, 2012 at 9:32 AM, Giulio Troccoli giulio.trocc...@mediatelgroup.co.uk mailto:giulio.trocc...@mediatelgroup.co.uk wrote: Do you mean that the files are shown with an A in the first column? No, they're shown as ? logs/error.log ? logs/access.log But they're not automagically ignored, even though they match logs/* which successfully is applied as an svn:ignore pattern on trunk. Ok, have you tried ignoring just logs rather than all files, I mean svn ps svn:ignore logs ? As Andy said, the * is expanded by your shell, so basically you won't ignore future logs. G
Re: Feature request - SVN command to clean a working copy of all unversioned and ignored files and directories
On 09/03/12 13:56, Simon Dean wrote: Hi Are there any plans to add a command to SVN that cleans a working copy or path of all unversioned and/or ignored files and directories? This is a very common need for automated Continuous Integration builds where a working copy is reused for multiple runs of the same build. Currently there is no simple and fast way to restore a working copy to a prestine state. Often users have to choose between i) completely deleting the working copy for every build and then doing a fresh checkout from scratch or ii) living with lots of unversioned and ignored files and directories building up with each successive build. The only option at the moment is to write a shell/batch script to provide this feature which is messy and there's common way to do this. A new SVN command or enhanced exiting command that provided this functionality would be incredibly useful. As an example, here is the DOS batch script that I use at the moment: @echo off :: revert any uncommitted changes svn revert . --recursive :: remove all unversioned and all ignored files and directories for /f usebackq tokens=1* %%i in (`svn status --depth infinity --no-ignore ^| findstr /r ^[\?I]`) do ( if not %%j == %~nx0 ( if exist %%j\* ( echo deleting unversioned directory %%j attrib -h %%j /d /s rmdir /s /q %%j ) else ( echo deleting unversioned file %%j attrib -h %%j del /f %%j ) ) ) A possible command line syntax might look something like this: svn revert . --ignored --unversioned --recursive Sorry, but to me this has got nothing to do with Subversion. Your CI tool is should clean up itself. Having said that, if someone wants to implement such feature I don't think I would have anything against it. But I doubt it will (be implemented) Giulio
Re: Feature request - SVN command to clean a working copy of all unversioned and ignored files and directories
On 09/03/12 14:35, Simon Dean wrote: From: Giulio Troccoli [mailto:giulio.trocc...@mediatelgroup.co.uk] Sorry, but to me this has got nothing to do with Subversion. Your CI tool is should clean up itself. Having said that, if someone wants to implement such feature I don't think I would have anything against it. But I doubt it will (be implemented) Giulio Thanks for the reply. There are 5 or 6 popular CI tools out there (and there's probably more of them than that). If implemented in the CI tool, each tool would have to implement it for themselves. Plus a CI tool would have to implement a separate solution for each VCS it supports (e.g. git, perforce, mercurial etc). As this is a feature that requires an SVN specific implementation and isn't a feature specific to CI builds - it's just a feature to restore a working copy to pristine state - SVN seems like a good place for it? I suspect developers would also benefit from such a feature on their development PCs too and not just on CI servers? [CC to the list, remember to reply-to-all] Why would the CI implement a different solution for each VCS? Those, I understand, are files created during the build process, they have got nothing to do with SVN or any other VCS. And it's not a SVN specific implementation as, again, the files were not created by SVN so they've got nothing to do with it. From Subversion's point of view the the WC is absolutely fine. The unversioned files are ignore and there are no missing files (and if there are a simple svn up will restore them) But maybe I'm missing something?
Re: Feature request - SVN command to clean a working copy of all unversioned and ignored files and directories
On 09/03/12 15:03, Simon Dean wrote: From: Giulio Troccoli [mailto:giulio.trocc...@mediatelgroup.co.uk] Why would the CI implement a different solution for each VCS? Those, I understand, are files created during the build process, they have got nothing to do with SVN or any other VCS. And it's not a SVN specific implementation as, again, the files were not created by SVN so they've got nothing to do with it. From Subversion's point of view the the WC is absolutely fine. The unversioned files are ignore and there are no missing files (and if there are a simple svn up will restore them) But maybe I'm missing something? A CI implementation would have to implement it specifically each VCS as it would have to call the VCS to found out what files/directories are unversioned and ignored. So the CI would rely on another piece of software, SVN in this case, to know what it has created in terms of files. Well, it doesn't seem right to me.
Re: Upgrade Subversion 1.4.3
On 01/02/12 14:38, James Boden wrote: I would like to upgrade my subversion from 1.4.3 to the newest one. What is entailed to do this? Thanks Do you want to upgrade the server, client or both? On what system(s)? If you would like to upgrade the server, do you want to upgrade the repositories too? G
Re: Upgrade Subversion 1.4.3
On 01/02/12 15:58, James Boden wrote: Ok, I reviewed the release-notes. My question is do I have to upgrade to 1.5 then 1.6 and then 1.7.2?If this is the case where is the installer for these versions? Also what about the information I currently have stored in the repositories. According to the release-notes they will be automatically upgraded, if I am understanding correctly. Actually the Working Copies are automatically upgraded when touched for the first time by the new version. The Repositories are NOT automatically upgraded, but it's a manual step through svnadmin upgrade (which mean *you* decide if and when to upgrade the repository). Giulio
Re: Compatible with Microsoft Office and Internet Explorer
On 25/01/12 06:26, Ryan Schmidt wrote: I apologize in advance if the below reply is snarky, but I'm a little tired of this particular topic; it has been talked to death already long ago. On Jan 24, 2012, at 19:24, Nico Kadel-Garcia wrote: The big booby trap I notice with all Windows/Subversion use is the understandable desire to use native end-of-line characters to swap text files gracefully between Linux, Windows, and MacOS. Don't do that: it can bite you *VERY* hard if you access the same network filesystem, such as a CIFS share, from each of those operating systems or with CygWin on Windows. Nico, I know you have a strong opinion about the svn:eol-style property, specifically that it should never be used, and you love voicing this opinion in as many threads on this mailing list as possible, regardless of whether it is relevant to the thread or not. I'll respond yet again, in a different form that is perhaps more effective in explaining my views: There are several kinds of files you might have in your repository: 1. Binary files, such as images, sounds, videos, compiled programs, compressed archives, spreadsheets, presentations, some word processing documents, etc. Setting svn:eol-style to any value on these files would likely corrupt them, so svn:eol-style should not be set on these kinds of files. 2. Text files where you want some lines to have LF line endings and other lines to have CRLF line endings. I hope there is agreement that nobody ever wants these kinds of files, yet this is exactly the kind of file you will get if you do not set svn:eol-style, and you have several different people editing the files, on different platforms, using different editors. That was my actual experience at the last company I worked for. The specific problem editor in our case was UltraEdit on Windows, which happened to be the editor my company had paid for, so it was the one most of our developers were using. Unless you set four separate settings in its options window to four specific non-default values (which you had to wade through a hundred other options to find), it had very strange ideas about how line endings should be handled. (It preserved the existing line ending style for lines you did not edit, but used CRLF line endings for any lines you did edit.) Therefore, I recommend you always set the svn:eol-style property of text files to some value. What value? Read on. 3. Text files where you want line endings to always be LF regardless of platform. In this case, set svn:eol-style to LF. The Subversion client transforms the file's line endings to LF before commit, and when you check out, gives you a file with LF line endings. If you or your broken editor somehow transform some of the file's lines to CRLF line ending, the Subversion client* will prevent you from committing that broken text file back to the repository until you fix the broken line endings so that they are consistent. Hooray. Note that there is no problem if you or your editor convert the *entire* file to a different line ending style before committing; Subversion will seamlessly convert it back to the line ending style indicated in the svn:eol-style property. 4. Text files where you want line endings to always be CRLF regardless of platform. In this case, set svn:eol-style to CRLF. In the same spirit as (3) above, the Subversion client* will ensure the file in the repository has only CRLF line endings. 5. Text files where you want line endings to be CRLF if checked out with a native Windows client, and LF otherwise. In this case, set svn:eol-style to native. Subversion will store the file in the repository with LF line endings. When checking out on native Windows, it will convert the line endings from LF to CRLF, and on commit, will convert back to LF. On non-Windows systems (including cygwin, I believe), the files will be checked out and committed in their unconverted state using LF line endings. Yes, you will run into problems if you share a working copy between native Windows and non-Windows (including cygwin IIRC) environments. Rather than state that svn:eol-style should therefore never be used, or should never be set to native, you should instead stop sharing working copies. If you cannot give that up, then yes, in your specific unusual case, setting svn:eol-style to native might not be a good idea. Do not however condemn the use of svn:eol-style native for everyone, nor the use of svn:eol-style in general. I manage a repository of web site code. It contains HTML web pages, CSS stylesheets, JavaScript code, Markdown-formatted documentation. On my Mac I prefer these files to have LF line endings, because if I want to use UNIX command line tools on these files, they work best with LF line endings, and GUI editors on OS X default to LF line endings too. I assume Windows users would prefer them to have CRLF line endings, because that's what Notepad and probably other Windows
Re: Errors with mtime-retaining import script: pre-revprop-change issue?
On 25/01/12 15:09, Alexander Shenkin wrote: Hello, I'm using the svn import script by Oliver Betz to retain file mtime upon initial import (http://svn.haxx.se/users/archive-2006-10/1345.shtml), but i'm getting some errors. I'm hoping someone might be able to help me out. when i run the script, i get the following error: $ perl importWithMtime.pl svn propset svn:date 2001-10-29T18:34:10.00Z --revprop -r HEAD svn: E175002: DAV request failed; it's possible that the repository's pre-revprop-change hook either failed or is non-existent svn: E175008: At least one property change failed; repository is unchanged svn: E175002: Error setting property 'date': Repository has not been enabled to accept revision propchanges; ask the administrator to create a pre-revprop-change hook I do have a pre-revprop-change.tmpl hook in the repository. It contains the code below. I'm using VisualSVN 2.5.2 on a Windows 7 x64 machine with Cygwin Perl and TortoiseSVN. Any help would be greatly appreciated! Thanks, Alex --- $ cat pre-revprop-change.tmpl #!/bin/sh # PRE-REVPROP-CHANGE HOOK # # The pre-revprop-change hook is invoked before a revision property # is added, modified or deleted. Subversion runs this hook by invoking # a program (script, executable, binary, etc.) named 'pre-revprop-change' # (for which this file is a template), with the following ordered # arguments: # # [1] REPOS-PATH (the path to this repository) # [2] REV (the revision being tweaked) # [3] USER (the username of the person tweaking the property) # [4] PROPNAME (the property being set on the revision) # [5] ACTION (the property is being 'A'dded, 'M'odified, or 'D'eleted) # # [STDIN] PROPVAL ** the new property value is passed via STDIN. # # If the hook program exits with success, the propchange happens; but # if it exits with failure (non-zero), the propchange doesn't happen. # The hook program can use the 'svnlook' utility to examine the # existing value of the revision property. # # WARNING: unlike other hooks, this hook MUST exist for revision # properties to be changed. If the hook does not exist, Subversion # will behave as if the hook were present, but failed. The reason # for this is that revision properties are UNVERSIONED, meaning that # a successful propchange is destructive; the old value is gone # forever. We recommend the hook back up the old value somewhere. # # On a Unix system, the normal procedure is to have 'pre-revprop-change' # invoke other programs to do the real work, though it may do the # work itself too. # # Note that 'pre-revprop-change' must be executable by the user(s) who will # invoke it (typically the user httpd runs as), and that user must # have filesystem-level permission to access the repository. # # On a Windows system, you should name the hook program # 'pre-revprop-change.bat' or 'pre-revprop-change.exe', # but the basic idea is the same. # # The hook program typically does not inherit the environment of # its parent process. For example, a common problem is for the # PATH environment variable to not be set to its usual value, so # that subprograms fail to launch unless invoked via absolute path. # If you're having unexpected problems with a hook program, the # culprit may be unusual (or missing) environment variables. # # Here is an example hook script, for a Unix /bin/sh interpreter. # For more examples and pre-written hooks, see those in # the Subversion repository at # http://svn.apache.org/repos/asf/subversion/trunk/tools/hook-scripts/ and # http://svn.apache.org/repos/asf/subversion/trunk/contrib/hook-scripts/ REPOS=$1 REV=$2 USER=$3 PROPNAME=$4 ACTION=$5 if [ $ACTION = M -a $PROPNAME = svn:log ]; then exit 0; fi echo Changing revision properties other than svn:log is prohibited 2 exit 1 The hook has to be called pre-revprop-change on *nix systems and be executable or pre-revprop-change.bat on Windows. So, no .tmpl extension.
Re: bi-directional merging?
On 16/01/12 16:08, Grabner Markus wrote: Hi! I have a few questions regarding a particular subversion usage scenario. We are two teams, each working on more or less unrelated portions of a common code base. To isolate each team from stability issues introduced due to the work of the other team, we consider creating a separate branch for each team. Whenever one team considers its work to be stable (after a few weeks), it is reintegrated into the trunk, from where it can be picked up by the other team. However, there are also cases when changes need to be synchronized more quickly (e.g., critical bug fixes). This could be done by merging individual revisions of one branch back into the trunk, but since this workflow is different from the proposals discussed in http://svnbook.red-bean.com/en/1.7/svn.branchmerge.commonpatterns.html, I'm not sure about its consequences. So my questions are: *) Will it cause troubles (in terms of merge conflicts, performance, etc.) to perform bi-directional merging between the trunk and a branch created from the trunk (i.e., alternately merge changes from the trunk into the branch and from the branch into the trunk)? *) Will it cause troubles to perform a reintegration of the branch after some of the changes in the branch have already been merged into the trunk individually? *) Is there a different best-practice recommendation to achieve the isolation of two development teams as sketched above? Thanks kind regards, Markus Dipl.- Ing. Dr. techn. Markus Grabner Research Development Team phone +43 (0) 316 4000 761 fax +43 (0) 316 4000 711 www.alicona.com Alicona Imaging GmbH - Optical 3D measurement and inspection - Teslastraße 8 - 8074 Grambach/Graz - Austria Registered office: Grambach, FN 208097a, Landesgericht für ZRS Graz / This e-mail may contain privileged and/or confidential information. If you receive this email in error or are not the intended recipient, you may not use, copy, disseminate or distribute it. Do not open any attachments, delete it immediately from your system and notify the sender promptly by email that you have done so. If you're talking about critical bug fixes in trunk then I think I remember the recommended way would be to create a new branch for this fix, reintegrate to trunk, merge to the two development branches. Giulio
Re: Can not do autoimic commit for deleted forlder and modification in some other folders/ files.
On 24/11/11 07:47, Sachin Deshpande wrote: Hello, I am using SVN command line client 1.6.2 on windows. I have following folder structure Trunk Folder1 File1 File2 Folder2 File3 File4 Folder3 File5 File6 I have perform following local operations changed *Folder1*'s property. Modified *File1* Deleted *Folder2* ** I would like to do the commit of following Property change in Folder1 Deleted Folder2 *But don't want to commit the changes done in File1.* How can I do it with one svn commit command ( atomic commit ). If we use Svn commit --m msg Trunk\Folder1 Trunk\Folder2 It will work properly but will also commit the changes in Trunk\Folder1\File1 To avoid it if we use Svn commit --m msg --depth=empty Trunk\Folder1 Trunk\Folder2\File3 Trunk\Folder2\File4 Trunk\Folder2 Commit fails as it does not get the File3, file4 on disk. Svn commit --m msg --depth=empty Trunk\Folder1 Trunk\Folder2 Commit fails as with error. svn: Cannot non-recursively commit a directory deletion of a directory with child nodes Is this a bug or is there any way to perform atomic commit in the scenario explained. Thanks and regards, Sachin. I haven't tested this but my first idea would be to use changelists. Add Folder1 and Folder2 to a changelist svn cl test Trunk\Folder1 svn cl test Trunk\Folder2 and then remove File1 from it svn cl test --remove Trunk\Folder1\File1 Check that the changelist contains exactly what you want svn st Finally, commit using the changelist svn ci --changelist test -m msg As I said, I haven't tested this. Good luck Giulio
Re: Creating commits with empty changesets
On 07/11/11 21:34, Jö Fahlke wrote: Hi! Is there any way to do a commit with and empty changeset, but non-empty commit message? I made a typo in a commit message. Unfortunately the typo isn't just cosmetic, since it is right in a revision number referencing another commit. Even more unfortunately, changing the commit message after having commited isn't really an option (it's not important enough to change history). My next best idea was to make another commit right after the faulty one, with an empty changeset and a commit message explaining the previous error. But svn silently ignores my attempts to this end. I'm using the commandline client from Debian: svn, version 1.6.12 (r955767) compiled May 31 2011, 19:23:20 Thanks, Jö. I really don't understand why you can't use svn pe svn:log filename This doesn't change history, the commit you did doesn't change. You're only correcting a mistake in the message.
Re: SVN detects deleted files [SOLVED]
On 24/08/11 12:15, Giulio Troccoli wrote: Recently I have starting experiencing something I always thought not possible in Subversion. I work on Ubuntu with SVN 1.6.12. If I move or delete a file using the OS Subverision marks the file as deleted rather than missing. $ rm foo.php $ svn st D foo.php while I was expecting $ svn st ! foo.php Has this been introduced in 1.6.12? Is there a way to switch it off ? Thanks Giulio In my case the problem was caused by the Netbeans Subversion plugin. Apparently it scans the source code directories and performs an 'svn rm' on any missing files. Once I have disabled the plugin (which I never use anyway, I prefer the CLI) I never experience the problem again. Giulio
Re: subversion upgrade from 1.4.6 to 1.7
On 29/09/11 05:33, Rajesh wrote: On Wed, Sep 21, 2011 at 5:59 AM, Daniel Shahafd...@daniel.shahaf.name wrote: Hyrum K Wright wrote on Wed, Sep 21, 2011 at 05:44:33 -0500: 2011/9/21 Ulrich Eckhardtulrich.eckha...@dominolaser.com: Am 21.09.2011 11:00, schrieb Hyrum K Wright: [repository upgrade] Since you are moving from 1.4 to 1.7, however, you may want to run 'svnadmin upgrade' on the new repositories, to enable new features available since 1.4. Wait: I was under the impression that this enabled new features _as far as possible_, but that some extensive internal changes (sharding? reverse deltas? something?) actually required a dump/load cycle to make full use of, or am I mistaken? You're right: sharding may require a load to enable (though I seem to recall a script somewhere would would do it to a live repo). Things like packing can be enabled with a simple upgrade of the repository. Except that sharding is a prerequisite to packing. wanted to thank each and every one for their suggestions.. here is what i did. 1/ setup a new box with svn 1.7 rc3 2/ svnsync from main repo via a small script .. so all sync continues on a cron schedule 3/ I have about 500 repos and 200G data so will take a month to sync .. i observed that the packing is happening at the default 1000 rev into its own dir and i decided to leave it at that . 4/ will do a dns flip and bring the 1.7 up and running. 5/ remove the 0 th property so no one can accidentally sync from the previous location. 6/ make this new repo the master .. setup some other repository browsing tools on the old location. Thanks again for your time .. much appreciated help from each one of the folks. Regards, Raj Don't forget to copy over your hooks as they are not copied by svnsync. Also make sure to set the new repositories' UUIDs as the old ones or you will have to do a switch --relocate on all your WCs Giulio
SVN detects deleted files
Recently I have starting experiencing something I always thought not possible in Subversion. I work on Ubuntu with SVN 1.6.12. If I move or delete a file using the OS Subverision marks the file as deleted rather than missing. $ rm foo.php $ svn st D foo.php while I was expecting $ svn st ! foo.php Has this been introduced in 1.6.12? Is there a way to switch it off ? Thanks Giulio
Re: SVN detects deleted files
On 24/08/11 12:28, Stefan Sperling wrote: On Wed, Aug 24, 2011 at 12:15:28PM +0100, Giulio Troccoli wrote: Recently I have starting experiencing something I always thought not possible in Subversion. I work on Ubuntu with SVN 1.6.12. If I move or delete a file using the OS Subverision marks the file as deleted rather than missing. $ rm foo.php $ svn st D foo.php while I was expecting $ svn st ! foo.php This should be the output, yes. Has this been introduced in 1.6.12? Is there a way to switch it off ? No, this hasn't changed. Something must have run 'svn rm' or 'svn move' on this file. I thought so, but I have checked both rm and mv and they are not aliases or scripts. I'm really lost here Giulio
Re: SVN detects deleted files
On 24/08/11 14:33, Stein Somers wrote: Something must have run 'svn rm' or 'svn move' on this file. Which could have happened long ago. Also long ago, something may have recreated the actual file without reverting the delete in svn. Then the effects you describe are perfectly normal. For subversion, the file status was D all along. I don't believe so. Just today I was working on a file. I wanted to commit a separate change on the same file, so I shelved it: rename it (using the mv command) and run svn update to get the original copy. I have used this method many, many times in the past and it has always worked. This time, however, Subversion said that everything was up-to-date. I was expecting the usual Restore message, but it didn't happen. When I ran svn st I saw that the file was marked as deleted. Giulio
Re: the revision number and a tag
On 11/08/11 16:59, Michael Hüttermann wrote: Hello, given a Subversion tag, what's the best way to get the revision number of that tag, i.e. the revision number with which the tag was created? Is it possible at all having checked out the tag to a local working copy? Or is there any other way to cross-reference a tag to a revision number? Thanks. Michael I think svn log --limit 1 would work. It will give you the last log when the tag was modified. Since a tag should never be modified that log should refer to the copy G
Re: the revision number and a tag
On 11/08/11 17:02, Giulio Troccoli wrote: On 11/08/11 16:59, Michael Hüttermann wrote: Hello, given a Subversion tag, what's the best way to get the revision number of that tag, i.e. the revision number with which the tag was created? Is it possible at all having checked out the tag to a local working copy? Or is there any other way to cross-reference a tag to a revision number? Thanks. Michael I think svn log --limit 1 would work. It will give you the last log when the tag was modified. Since a tag should never be modified that log should refer to the copy G Obviously there will need to be some parsing of the output if you want just the revision number (to be used in a script for example)
Re: Cannot get a file when deleted
On 09/08/11 16:18, Adam Tong wrote: svn st gives the that the file was deleted (D) when i do svn up it does not bring it. But when i did the first sugetion of copy -r it worked sorry about forgeting to reply to all On Tue, Aug 9, 2011 at 11:03 AM, Giulio Troccoli giulio.trocc...@mediatelgroup.co.uk wrote: On 09/08/11 16:02, Adam Tong wrote: you are right i used the os, i did not commit after deleting. On Tue, Aug 9, 2011 at 11:00 AM, Giulio Troccoli giulio.trocc...@mediatelgroup.co.ukwrote: On 09/08/11 15:40, Adam Tong wrote: Hi, When i remove a file from my local copy, I cannot get it from the repository using the command svn up. Is there another way to get a recently deleted file? or there is something wrong in my settings. Thanks Did you use the OS to delete the file or Subversion? Did you commit? If you can tell as exactly what you did we'd be in a better position to help In that case the file should be back. What does svn status say? And please, Reply-to-all so that the conversation stays on the mailing list Gulio Well, is svn st says it's been deleted than you have use svn to delete the file, or Subversion wouldn't know about it. So to restore it you can simply use svn revert Giulio
Re: Cannot get a file when deleted
On 09/08/11 16:28, Adam Tong wrote: You are right i just tested when i do revert it is reverted and i can see it in the file system. On the other hand, I am sure that i am doing rm filename and not svn delete filename. Maybe there is a way to configure svn so that it considers rm as equivalent to svn delete? Because this is happens in my job and does not in my laptop at home. On Tue, Aug 9, 2011 at 11:20 AM, Giulio Troccoli giulio.trocc...@mediatelgroup.co.uk wrote: On 09/08/11 16:18, Adam Tong wrote: svn st gives the that the file was deleted (D) when i do svn up it does not bring it. But when i did the first sugetion of copy -r it worked sorry about forgeting to reply to all On Tue, Aug 9, 2011 at 11:03 AM, Giulio Troccoli giulio.trocc...@mediatelgroup.co.ukwrote: On 09/08/11 16:02, Adam Tong wrote: you are right i used the os, i did not commit after deleting. On Tue, Aug 9, 2011 at 11:00 AM, Giulio Troccoli giulio.trocc...@mediatelgroup.co.uk wrote: On 09/08/11 15:40, Adam Tong wrote: Hi, When i remove a file from my local copy, I cannot get it from the repository using the command svn up. Is there another way to get a recently deleted file? or there is something wrong in my settings. Thanks Did you use the OS to delete the file or Subversion? Did you commit? If you can tell as exactly what you did we'd be in a better position to help In that case the file should be back. What does svn status say? And please, Reply-to-all so that the conversation stays on the mailing list Gulio Well, is svn st says it's been deleted than you have use svn to delete the file, or Subversion wouldn't know about it. So to restore it you can simply use svn revert Giulio As far as I know no, there is no way to configure Subversion to know that. If you're using a Unix-like OS at work, make sure you don't have an alias, or maybe a local rm that it's actually a svn rm in disguise Giulio
Estimation of repository upgrade
I'm working on a plan to upgrade our server from 1.4.6 to 1.6.17. We have 75 repositories, with an average size of 30MB. They're not big, I agree, but I wonder if anyone has any tip on how to estimate how long the svnadmin upgrade command will take. I mean, will it be a matter or minutes or hours? Also, I'm confused whether I need to run svnadmin pack as well, or if the upgrade will do it for me. If I need to run, does anyone has an idea of how long it could take? Thanks Giulio Troccoli
Re: Estimation of repository upgrade
On 05/08/11 14:18, Mark Phippard wrote: On Fri, Aug 5, 2011 at 7:09 AM, Giulio Troccoli giulio.trocc...@mediatelgroup.co.uk mailto:giulio.trocc...@mediatelgroup.co.uk wrote: I'm working on a plan to upgrade our server from 1.4.6 to 1.6.17. We have 75 repositories, with an average size of 30MB. They're not big, I agree, but I wonder if anyone has any tip on how to estimate how long the svnadmin upgrade command will take. I mean, will it be a matter or minutes or hours? svnadmin upgrade runs in literally a few milliseconds. All it does is change the format number of the repository. If you want to fully move to all of the new repository features in 1.6 you have to do dump/load which will take longer. Wouldn't svnadmin upgrade give me the exact same thing as a dump/load cycle? If not, what would be different? Also, I'm confused whether I need to run svnadmin pack as well, or if the upgrade will do it for me. If I need to run, does anyone has an idea of how long it could take? svnadmin pack is never an automatic feature. Unless you are really short on inodes in the volume I would not even recommend running it. Thanks Giulio Trocccoli
Re: Estimation of repository upgrade
On 05/08/11 17:11, Nico Kadel-Garcia wrote: On Fri, Aug 5, 2011 at 10:58 AM, Bob Archerbob.arc...@amsi.com wrote: Has anything been done to improve the speed of a load. Last time I did it, when moving from 1.5 to 1.6 it took over 12 hours. And now, two years later the repo is probably quite a bit bigger (because we stupidly store binaries in it, I might change that when upgrading to 1.7). You can pre-configure by using svnsync to pre-create a new repository, and replicate relevant configuration files or scripts manually when ready to switchover. This is what I've used for migrating between servers that do not have shared back end storage, especially when updating operating systems and Subversion releases on the servers. Thanks Nico, I was thinking along those lines. However, the need for an upgrade is mostly for bug fixes and the fact that 1.4 is out of support. We will not use any (that I know of) of the new feature in 1.6 so I'm not even sure now if we need to run an svnadmin upgrade a all.
Re: Strange behavior on directory delete/commit
On 02/08/11 07:40, Dominik Psenner wrote: Hi, having a fresh subversion repository doing this as preparation: $ mkdir foo/ $ svn add foo $ svn commit -m test Adding foo Revision X sent. $ rmdir foo $ svn st ! foo $ svn delete foo D foo And finally this command fails: $ svn commit foo -m fail svn: entry foo has no URL This instead does work: $ svn commit -m works Delete foo Revision X sent. svn commit behaves inconsistently depending on whether a PATH argument is given or not. If it is a bug, it should get at least priority P2 because one is unable to commit partial changes to the WC as in this scenario: $ mkdir foo/ $ svn add foo A foo $ svn commit -m test Adding foo Revision X sent. $ rmdir foo $ svn st ! foo $ svn delete foo D foo $ touch bar $ touch foobar $ svn add bar foobar A bar A foobar $ svn commit foo bar svn: entry foo has no URL To get things done, one would have to backup foobar somewhere, revert foobar, do the commit without PATH arguments and copy foobar over to the WC. *eek* Let me know what you think about this! Greetings, D. I think SVN is behaving correctly. When you do svn commit foo you're telling Subversion to commit changes made in foo. There are no changes in foo because it's been deleted. The changes, instead, are in its parent directory, the one from where you issued your commands. That's why svn commi works, it assumes . as the path.
Re: Subversion version 7.0 Beta2 release configure attempt error
On 27/07/11 15:28, Rob Patten wrote: Noting the Subversion 7.0 Beta2 is released we are attempting to get ahead start on user request to have Subversion install on our IBM servers. Our user community requested any near current version at least but notified they will require version 7.0 for their project needs. We have had difficulty in the past getting all the dependencies to configure correctly. Currently attempting this under AIX 5.3 but intend to use it under AIX 6.1 and 7.1 too. We understand that this version 7.0 is not fully released yet but if we can get it to configure and install would save us considerable effort in the near future. Of course we would like to get any version of Subversion to install on AIX too. The dependencies always seem to be the issue. I confirm that I did apply the dependency get-deps.sh successfully. Have tried numerous configure attempts to see if I can get it work within the package source directory. We hope to easily move it from server to server if this works. Getting what appears to be only one dependency error related to APR-util indicated. Any help or recommendations would be appreciated: Package file listing r...@sligo.ncdc.noaa.gov:/tmp/subversion-1.7.0-beta2 -ls -l total 3728 -rw-rw-r--1 3300 3300 0 Jul 21 23:11 .swig_checked -rw-rw-r--1 3300 3300 94 Feb 22 2010 BUGS -rw-rw-r--1 3300 3300 186579 Jul 21 16:51 CHANGES -rw-rw-r--1 3300 3300 12956 Jun 27 11:16 COMMITTERS -rw-rw-r--1 3300 3300 64417 Jul 08 05:40 INSTALL -rw-rw-r--1 3300 3300 14214 Feb 03 2010 LICENSE -rw-rw-r--1 3300 3300 34568 Jul 16 07:50 Makefile.in -rw-rw-r--1 3300 3300593 Mar 27 23:54 NOTICE -rw-rw-r--1 3300 3300 2301 Jun 30 13:54 README -rw-rw-r--1 3300 3300 2028 Dec 07 2009 aclocal.m4 drwxr-xr-x 25 1000 1000 1536 Jul 26 15:56 apr drwxr-xr-x 19 1000 1000 1024 May 19 10:58 apr-util -rwxrwxr-x1 3300 3300 6256 Jul 04 06:24 autogen.sh drwxrwxr-x6 3300 3300 1024 Jul 21 23:12 build -rw-rw-r--1 3300 3300 568333 Jul 21 23:12 build-outputs.mk -rw-rw-r--1 3300 3300 34702 Jul 08 19:23 build.conf -rw-rw-r--1 root system16193 Jul 26 15:56 config.log -rwxrwxr-x1 root system 297 Jul 26 15:50 config.nice -rwxrwxr-x1 3300 3300 790792 Jul 21 23:12 configure -rw-rw-r--1 3300 3300 46645 Jul 16 07:49 configure.ac drwxrwxr-x4 3300 3300512 Jul 21 23:11 doc -rw-rw-r--1 3300 3300 23 Jul 21 23:12 gen-make.opts -rwxrwxr-x1 3300 3300 10604 Mar 25 12:30 gen-make.py -rwxrwxr-x1 3300 3300 3444 Jun 25 20:23 get-deps.sh drwxrwxr-x7 500 cfgsoft1024 May 03 08:25 neon drwxr-xr-x6 1000 1000512 Mar 12 12:43 serf drwxr-xr-x2 root system 512 May 19 09:35 sqlite-amalgamation drwxrwxr-x 33 3300 3300 1024 Jul 21 23:12 subversion drwxrwxr-x 14 3300 3300512 Jul 21 23:10 tools -rw-rw-r--1 3300 3300 27426 Jul 12 14:30 win-tests.py drwxr-xr-x 12 csi_acct perf 1536 Apr 20 2010 zlib Package dependency install: r...@sligo.ncdc.noaa.gov:/tmp/subversion-1.7.0-beta2 -./get-deps.sh --2011-07-26 10:56:44-- http://archive.apache.org/dist/apr/apr-1.4.5.tar.bz2 Resolving archive.apache.org... 140.211.11.131 Connecting to archive.apache.org|140.211.11.131|:80... connected. HTTP request sent, awaiting response... 200 OK Length: 754763 (737K) [application/x-bzip2] Saving to: apr-1.4.5.tar.bz2 100%[=] 754,763 936K/s in 0.8s 2011-07-26 10:56:46 (936 KB/s) - apr-1.4.5.tar.bz2 saved [754763/754763] --2011-07-26 10:56:46-- http://archive.apache.org/dist/apr/apr-util-1.3.12.tar.bz2 Resolving archive.apache.org... 140.211.11.131 Connecting to archive.apache.org|140.211.11.131|:80... connected. HTTP request sent, awaiting response... 200 OK Length: 607646 (593K) [application/x-bzip2] Saving to: apr-util-1.3.12.tar.bz2 100%[=] 607,646 807K/s in 0.7s 2011-07-26 10:56:47 (807 KB/s) - apr-util-1.3.12.tar.bz2 saved [607646/607646] --2011-07-26 10:56:57-- http://webdav.org/neon/neon-0.29.6.tar.gz Resolving webdav.org... 140.211.166.111 Connecting to webdav.org|140.211.166.111|:80... connected. HTTP request sent, awaiting response... 200 OK Length: 882267 (862K) [application/x-tar] Saving to: neon-0.29.6.tar.gz 100%[=] 882,267 787K/s in 1.1s 2011-07-26 10:57:00 (787 KB/s) - neon-0.29.6.tar.gz
Re: Moving Repositories to New server
On 26/07/11 15:35, Phil Pinkerton wrote: Are there any know issues with regards to moving Repositories from one platform to another ? Will the old Repositories maintain their current SVN revision ? Current platform Sun Solaris 10: SVN 1.6.5 Target platform Red Hat Enterprise 5 SVN 1.6.17 ( Subversion Edge ) Planned steps (Creating a script for the dumps and loads as there as a few hundred Repositories to move.) (1) Freeze the repository . Take a dump of the repository. (2) Verify the file is dumped correctly by making sure that the last version dumped is the same as the one in the live repository. Also check the return code of the svnadmin dump command. (3) Copy the dump file over to the new server. Verify that the file is copied over correctly. (4) Load the dump (5) Verify the load. (6) Migrate and hook scripts or authorization files over. (7) Verify the scripts and configuration files work. (8) If you have a name for the server for accessing it. You might have to point the name to the new server. a. use switch ? b. or relocate ? (9) Unfreeze the repository. Questions : Switch vs relocate ? Effects of load into a new Subversion version ? To minimise down-time I would suggest looking into using svnsync to create the new repository, I think something on the following lines should work 1. create the new repository and sync it with the master one 2. copy over the hooks and scripts 3. inform all users that the old repository is not available any longer and any commit will not work and possibly be lost 4. lock down the master repository. This may just be stopping Apache serving it, nothing drastic, like removing it, is neceserry yet. Besides, it's safer to keep it just in case 5. set the new repository as master. This involves deleting some revision properties on revision 0 that Subversion uses to sync the repository. As the new repository will not be synced any more these are no more necessary. Moreover, they will prevent the repository to work as a normal one rather than a synchronised copy. 6. inform all users to use svn switch --relocate to point their WCs to the new repository As you can see the old repository comes down only at step 4, and steps 5 takes only few seconds. I used this set-up for my DR solution. I had never had the chance to use it, but I did some testing and it seemed to work. Giulio
RE: Archiving Projects (End-Of-Life)
Linedata Limited Registered Office: 85 Gracechurch St., London, EC3V 0AA Registered in England and Wales No 3475006 VAT Reg No 710 3140 03 -Original Message- From: Johan Corveleyn [mailto:jcor...@gmail.com] Sent: 13 December 2010 20:04 To: users@subversion.apache.org Subject: Archiving Projects (End-Of-Life) Hi, I'm wondering if there is a (de-facto) standard way of end-of-lifing projects in an SVN repository, or any suggestions for this from other users on this list ... With End-Of-Life I mean there will be no further maintenance on that project, no more development, no more releases or patches, no more users. It's really dead. But sometimes one might want to take a look at the old code, check out its history, maybe even resurrect it, ... I would like to get those projects out of sight, so it's more clear what the active projects are. (I'm not talking about obliterating, to reclaim disk space or anything like that, quite the contrary: I want to have them still available, just ... less visible). I know I could just svn rm them, but some of the project owners feel a little bit uneasy about that. They consider it probable that they will need to take another look at them sometime in the future. And as we all know, it's not so easy to find a deleted file/directory/project again (to find out what the latest revision was in which the project still existed). My repository is currently structured as: trunk \--project1 \--project2 \--... branches tags But I think the question is more or less the same if it's structured in the other standard way (projects/TTB). Currently I have two options in mind: - Move the EOL'ed projects to a new directory archive, a new root directory next to TTB. - Move the EOL'ed projects to a tag (maybe also in an archive subdirectory, under tags). If it ever needs to be resurrected, it can be easily copied from that tag. Thoughts? Other ideas? Pros and cons? Maybe I'm missing something, but since you have a tags directory I guess you did tag your last release of the project. So why not just simply (svn) delete the project from trunk? The whole history is preserved in the latest tag for that project, is it not? Giulio
RE: Strange meta-data problem when checking out
Linedata Limited Registered Office: 85 Gracechurch St., London, EC3V 0AA Registered in England and Wales No 3475006 VAT Reg No 710 3140 03 -Original Message- From: Jochen Wuttke [mailto:wutt...@usi.ch] Sent: 10 December 2010 11:03 To: users@subversion.apache.org Subject: Strange meta-data problem when checking out Hi, when I try a fresh checkout from a shared repository I get the following error message: svn: In directory 'prospectus' svn: Can't open file 'prospectus/.svn/tmp/text-base/prospectus.tex.svn- base': No such file or directory A friend also tried a fresh checkout and got the same error. I tried 'svnadmin verify' on the repository and it verifies all revisions. I looked at the files stored in that offending directory via svnlook to see if someone tried to add the meta-data from .svn to the repository somehow, but did not see anything that shouldn't be there (i.e. only the files we need, no meta-data). I tried google for some hints on what causes this problem and how to fix it, but didn't find much that is promising. If at all possible I'd like to avoid restoring a backup, and since all revisions verify, I wouldn't now which revisions to dump to repair the problem. Any ideas? What is the exact command? What is the SVN version? OS?
RE: Diff tag against trunk head
Linedata Limited Registered Office: 85 Gracechurch St., London, EC3V 0AA Registered in England and Wales No 3475006 VAT Reg No 710 3140 03 -Original Message- From: Kevin Connor Arpe [mailto:kevina...@gmail.com] Sent: 23 November 2010 15:39 To: users@subversion.apache.org Subject: Diff tag against trunk head Hello, I am using the latest (stable) version on both Linux and WinSlows. For one of my repositories, I created a daily tag of a diary. Example: /project/trunk/important_stuff /project/tags/2010-11-20/important_stuff /project/tags/2010-11-21/important_stuff /project/tags/2010-11-22/important_stuff etc. Each morning I svn copy important_stuff (HEAD revision) to the tags area and commit. In theory, this will be used to easily find what changed day-over-day. Of course all of this is possible poking through svn logs, but I want to make this easier. My question: What is the SVN command to diff a file in a tagged set vs trunk head? Fantasy command: svn diff -rtag:2010-11-21 -rHEAD /project/trunk/important_stuff/details.txt or... svn diff -rtrunk:HEAD /project/tags/2010-11-21/important_stuff/details.txt I tried many different svn diff commands. No luck. I also did some heavy Google/StackOverflow searching. No luck. Is there a simple way to do this? Right now I am using regular GNU diff, but this requires everyone to download the tags to their box locally. Ideally, this could be done via the trunk or tag URL only. According to the help you can use this format of the svn diff svn diff old-u...@oldrev] new-u...@newrev] So svn diff http://url.to.repo/project/tags/2010-11-21/important_stuff/details.txt http://url.to.repo/project/trunk/important_stuff/details.txt Try it Giulio
RE: Can't see the wood for the trees (or: what are my branches called?)
Linedata Limited Registered Office: 85 Gracechurch St., London, EC3V 0AA Registered in England and Wales No 3475006 VAT Reg No 710 3140 03 -Original Message- From: Gary [mailto:subversion-u...@garydjones.name] Sent: 19 November 2010 08:32 To: users@subversion.apache.org Subject: Can't see the wood for the trees (or: what are my branches called?) Is there any way of finding out what branches I have created? I did look at the red book but it seems like there isn't anything, at least not where I expected to find it. You can use the ls command, probably with a depth of immediate, recursively until you find what you want: svn ls --depth immediate http://url.to.repo This will give you the list of directories at the root of your repository. Then you go deeper svn ls --depth immediate http://url.to.repo/branches Assuming branches is one of the folder in the root of the repository you want to investigate. G
Using a changelist with the revet command
Hi, I have found an odd behaviour with the revert command. Maybe it's intended, but I don't find it very intuitive. I'm using SVN 1.6.9. If I have a changelist and I want to revert all changes made in all files in the changelist I would use the following svn revert --changelist name That doesn't work. Not only I have to add the --depth option, but I also have to specify the PATH, so something like svn revert --depth infinity --changelist name . I don't think either are necessary though. The good thing about changelist is that with one easy command you can work on many files at ones, even if they are in different directories. With the above command, you still can, but from the deepest common directory of all the files in the changelist. The changelist has the full path of every file, so I would have though that the first command I tried would be enough. What do you think? G Linedata Limited Registered Office: 85 Gracechurch St., London, EC3V 0AA Registered in England and Wales No 3475006 VAT Reg No 710 3140 03
RE: Help or suggestions on porting to subversion
Linedata Limited Registered Office: 85 Gracechurch St., London, EC3V 0AA Registered in England and Wales No 3475006 VAT Reg No 710 3140 03 -Original Message- From: Cooke, Mark [mailto:mark.co...@siemens.com] Sent: 11 November 2010 08:50 To: Giulio Troccoli; users@subversion.apache.org Cc: San Martino Subject: RE: Help or suggestions on porting to subversion -Original Message- From: Giulio Troccoli [mailto:giulio.trocc...@uk.linedata.com] Sent: 11 November 2010 08:45 Subject: RE: Help or suggestions on porting to subversion [CUT] The thing we want is: - checkout single/scattered files from different directories - modify/commit them - group the files and tag this group (only the files in this group). This is not AFAIK directly possible in subversion (or any other similar tool that I have used). You could try using file externals in a new project directory but I have not used them and believe there are issues. According to the book it is possible (at least the last bit) http://svnbook.red-bean.com/nightly/en/svn.branchmerge.tags.ht ml#svn.bra nchmerge.tags.mkcomplex Giulio Ooo, thanks for that, learn a new thing every day. Just learned that myself yesterday, while looking for something else :-) However, I still think that the first step will be at least as expensive as doing the work to reorganise into a more relevant project tree which would then simplify the remainder of the steps. Without knowing why the OP is where they are it is hard to understand why they have to stay there. There is a Python script to automate sparse checkout https://svn.apache.org/repos/asf/subversion/trunk/tools/client-side/svn-viewspec.py Maybe that would help.
RE: SVN help : multiple repo configuration
Linedata Limited Registered Office: 85 Gracechurch St., London, EC3V 0AA Registered in England and Wales No 3475006 VAT Reg No 710 3140 03 -Original Message- From: Cooke, Mark [mailto:mark.co...@siemens.com] Sent: 11 November 2010 12:50 To: users@subversion.apache.org Cc: Neson Maxmelbin (RBEI/EMT5) Subject: RE: SVN help : multiple repo configuration From: Neson Maxmelbin (RBEI/EMT5) Sent: 11 November 2010 12:23 Subject: SVN help : multiple repo configuration Hello , I have setup SVN 1.6 with Apache 2.2 on a Windows Server 2003 R2 virtual server. I want to setup two repositories , so I have configured two Location sections in the httpd.conf and it seems to work. My Question is , is this a good practice or will this cause some errors/issues? The reason I want to do this is that the server will serve multiple departments . Each repositories will have multiple projects. That is how we have configured our system, with SVNParentPaths under each Location so that new repositories appear in the department's list automagically. We still need to manually create new repositories but that's not a heavy admin burden. I've not had any problems yet and hope that this will help to isolate any future problems to a minimum of projects... We don't use the SVNParentPath but each repositories, although they are all in the same place, have its own Location with SVNPath. We found this allows for better configuration, especially as they all have slightly different requirements. We've been using it for 5 years, without any problem. G
RE: Listing excluded items
I only just noticed the depth option 'exclude' (as it's not in the book yet, only the --help). I had noticed TortoiseSVN gave it as an option, but had presumed that it was akin to the other situations where TSVN has renamed or extended the CLI functionality. I have even used it a couple of times, but in TSVN it seems especially ... well, not dangerous, but one-sided, in light of my question: On the command line, I can get back excluded items with a new --set-depth on the item (I don't know how you'd do that it TSVN as you can't select it). But you have to know it's (not) there. Is there a way to see what excluded items are around (so I can tell what I might want to un-exclude)? It doesn't show up in diffs, status or anything I've tried yet. Maybe you could try the ls command with a URL svn ls http://url.to.repo/path/to/checkout/folder Similarly if you use svn:// access Linedata Limited Registered Office: 85 Gracechurch St., London, EC3V 0AA Registered in England and Wales No 3475006 VAT Reg No 710 3140 03
Advice on process for web development
Hi, I'm working with our Web Team to re-engineer their development process. All the code is already under Subversion, but everything is in one big directory. They're not using any branch or tags for that matter. And of course, testing is not as rigorous and controlled as it should be. Anyway, I have suggested the usual trunk/branches/tags layout. Developers will normally work on branches, but can occasionally work directly on trunk for easy and quick fixes. The tester will create a QA branch as a copy of trunk at a specific revision. When they are happy that a QA is ready for releasing, a tag is created from the QA (or maybe from trunk again at the same revision). I think they will go for such a solution, even though it means that they cannot pick-and-choose what to test. If they want to test a bug fixed in revision 1000, they will also test all bugs fixed in previous revision. The problem is that they may want to fast track an urgent bug fix. It shouldn't happen often, but it may happen so I need to come up with a solution for that case too. What I'm thinking is something like the following. Let's supposed that 1.1 is the latest release, i.e. it's what's in production. i) the developer creates a branch off the tag svn cp http://URL TO REPO/tags/1.1 http://UR TO REPO/branches/1.1_urgent_fix -mCreating branch fro urgent bug 123456 ii) the developer makes all the necesary, coding and testing iii) the fix is merged back to trunk cd trunk svn merge ^/branches/1.1_urgent_fix . svn ci -mFixing urgent bug 123456 iv) the branch goes live svn cp http://URL TO REPO/branches/1.1_urgent_fix http://URL TO REPO/tags/1.2 -mFixed bug 123456 switch the production site to point to ^/tags/1.2 v) at this point all the QA are useless because the do not contain the urgent fix, so a new QA must be created svn cp -rHEAD http://URL TO REPO/trunk http://URL TO REPO/tags/QA_1.3_1 -mCreated first QA for 1.3 Now my questions. 1 - Do you have any comments on the process and/or any suggestions? 2 - Would the merge, in step iii, do the right thing and merge all revisions committed into the branch into trunk? I can't use --reintegrate becuase I haven't previously merged from trunk to the branch (as the branch was created as a copy of a tag). 3 - I don't really like the fact that after the fix has gone live, we are forced to create a QA from HEAD, which means testing everything that has gone into trunk, but I can't think of another way to make sure the fix is indeed included in the Qas and especially in the next (1.3 in this case) release. Thank you in advance. Giulio Linedata Limited Registered Office: 85 Gracechurch St., London, EC3V 0AA Registered in England and Wales No 3475006 VAT Reg No 710 3140 03
Moving to Subversion for PL-SQL development
First of all let me tell you that I don't know much of how PL-SQL development works so I might say something really obvious to you or more likely just wrong. Please forgive me. I have a team that uses StarTeam as their VCS and we are now working on moving the project to Subversion. We are planning to use an importer for the initial load of the repository which seems to do what they want (I'm not looking after that part). I have a problem though with their releasing process. As I understand it, a major release is formed by all the packages and scripts, plus some table initialisation and sometime some data (I presume for defaults and stuff like that). Minor releases are done with patches which included only the packages that have changed from the previous patch. So, if I want 5.4.0 (major release), I get everything. I unpack the kit, install it, run it, whatever it take and I'm done. If I am already on 5.4.0 and I want 5.4.3 (a minor release) I will be sent 3 patches: to 5.4.1, then 5.4.2 and finally 5.4.3. Apparently I just need to unzip them and I'm done. Now, I might not be clear in the above process, so if someone with more experience with PL-SQL development and release wants to correct me, please do. I know there isn't one way to do things, but it's more likely that I understood wrong than we are doing it in a special way. Anyway, if I am right, I'm struggling to come up with a process using Subversion. It seems they do not want to tag everything in trunk because that would be like a major release (apparently it would include those table and data things). Maybe we could re-organised the code to separate the packages from the data and then we could tag the packages, which is more what they want. And this way, to go to 5.4.3 I won't need 5.4.1 and 5.4.2 at all, which in my opinion is even better. In the end what I am looking for with this email is some advice on how to proceed from people with more experience than me in projects using PL-SQL. Thanks Giulio Troccoli Linedata Limited Registered Office: 85 Gracechurch St., London, EC3V 0AA Registered in England and Wales No 3475006 VAT Reg No 710 3140 03
RE: Advice on process for web development
CC-ing the list -Original Message- From: Luiz Guilherme Kimel [mailto:lki...@dba.com.br] Sent: 29 October 2010 15:44 To: Giulio Troccoli Subject: RES: Advice on process for web development Giulio, I would recommend you a reference book for SCM patterns. Try ADDISON WESLEY Software Configuration Management Patterns. It has solutions Answering your questions, you need to stablish baselines for your software. Branches will have one baseline as their common start point, as their base. This base will usually be a stable version of your software. Let's say your baseline is exactly your current production release. What you're saying is that the branches should be created as copies of trunk at a specific revision, i.e. the production one. Have I understood correctly? Sometimes your baseline will evolve. Maybe because your QA team approved some new features for production, maybe because you made urgent corrections. If it's approved for production it will be your new baseline. All branches from this baseline will need to be rebased before releasing, they need to incorporate any production changes. So, basically, I need to merge changes in trunk from the previous production revision to the current production revision (which may not be HEAD at all) to the branches. Your correction will be tested isolated, approved and merged to your trunk for tagging and release. If your development branches are based on the trunk, then you will need to merge trunk changes to each development branch to rebase them. Use the development branch for integration so that the next approved branch will always merge to the trunk with no possibility of conflict. After rebasing, apply new QA tests. I'm not sure I understand you here. After the development in a branch has been completed, the branch is tested and if approved merged back into the trunk. Surely though I need to test trunk as well. I didn't say, but yes when a branch is reintegrated into the trunk, the other branches should merge from trunk to get those changes. Why your QA team have a branch??? They won't ever make changes, so all they need is a tag. I mean, in SVN it's the samething, but in the concept it's a lot different. The QA team does not have a branch. I realised I said create a QA branch as a copy of trunk but then in the command I did create the branch in tags. Which doesn't mean that they cannot change it, but it will be prevented and, as you said, conceptually is different. Do you already use any project management and bug tracking tool? If not, I would recommend MantisBT. We do. It's actually part of what the Web Team does. Thanks for your input, however, you haven't touched on the main issues I have, which is about the case of an urgent fix. Giulio Best Regards, Luiz Guilherme M. Kimel -Mensagem original- De: Giulio Troccoli [mailto:giulio.trocc...@uk.linedata.com] Enviada em: sexta-feira, 29 de outubro de 2010 09:20 Para: users@subversion.apache.org Assunto: Advice on process for web development Hi, I'm working with our Web Team to re-engineer their development process. All the code is already under Subversion, but everything is in one big directory. They're not using any branch or tags for that matter. And of course, testing is not as rigorous and controlled as it should be. Anyway, I have suggested the usual trunk/branches/tags layout. Developers will normally work on branches, but can occasionally work directly on trunk for easy and quick fixes. The tester will create a QA branch as a copy of trunk at a specific revision. When they are happy that a QA is ready for releasing, a tag is created from the QA (or maybe from trunk again at the same revision). I think they will go for such a solution, even though it means that they cannot pick-and-choose what to test. If they want to test a bug fixed in revision 1000, they will also test all bugs fixed in previous revision. The problem is that they may want to fast track an urgent bug fix. It shouldn't happen often, but it may happen so I need to come up with a solution for that case too. What I'm thinking is something like the following. Let's supposed that 1.1 is the latest release, i.e. it's what's in production. i) the developer creates a branch off the tag svn cp http://URL TO REPO/tags/1.1 http://UR TO REPO/branches/1.1_urgent_fix -mCreating branch fro urgent bug 123456 ii) the developer makes all the necesary, coding and testing iii) the fix is merged back to trunk cd trunk svn merge ^/branches/1.1_urgent_fix . svn ci -mFixing urgent bug 123456 iv) the branch goes live svn cp http://URL TO REPO/branches/1.1_urgent_fix http://URL TO REPO/tags/1.2 -mFixed bug 123456 switch the production site to point to ^/tags/1.2 v) at this point all the QA are useless because the do not contain the urgent
RE: Subversion on AIX
Linedata Limited Registered Office: 85 Gracechurch St., London, EC3V 0AA Registered in England and Wales No 3475006 VAT Reg No 710 3140 03 -Original Message- From: David Weintraub [mailto:qazw...@gmail.com] Sent: 13 October 2010 18:03 To: Giulio Troccoli Cc: Subversion Subject: Re: Subversion on AIX I was able to build everything until neon. There I get $ ./configure --with-expat=/app/fms/build/lib/libexpat.la --enable-shared=yes --prefix=/app/fms/build checking for a BSD-compatible install... ./install-sh -c checking for gcc... gcc checking for C compiler default output file name... configure: error: in `/app/fms/build/subversion-1.6.13/neon': configure: error: C compiler cannot create executables See `config.log' for more details. cmu...@fmsdwbap01:~/subversion-1.6.13/neon $ Can you give me any help? It looks like it's crapping out when it is trying to determine the default link output. However, apr, apr-util, and expat all worked. I didn't use gcc but cc CC=/usr/vac/bin/cc \ CFLAGS=-qmaxmem=-1 -O2 -qlanglvl=extended \ CPPFLAGS=-I/usr/local/include \ LDFLAGS=-brtl \ ./configure \ --with-expat=/usr/local/lib/libexpat.la \ --enable-shared=yes Can you try that? Adjust paths for expat according to your previous build G
RE: Subversion on AIX
Linedata Limited Registered Office: 85 Gracechurch St., London, EC3V 0AA Registered in England and Wales No 3475006 VAT Reg No 710 3140 03 -Original Message- From: David Weintraub [mailto:qazw...@gmail.com] Sent: 12 October 2010 18:41 To: Subversion Subject: Subversion on AIX We are trying to get a Subversion install on an IBM AIX box we have here. Unfortunately, I really don't have root access to the box, and I know that our admins will probably not be very helpful in this endeavor. I do have gcc version 4.0.0, but I don't have the APR library. We don't plan to use Apache httpd, but just svnserve instead. I downloaded the Universal AIX tarball (only 1.4, but I'd be happy with anything now), and had problems since it was tarred up at the root of the directory. I used pax to untar the file, so I could put it under something besides /opts. The files are placed under /home/david. $ LIBPATH=/home/david/subversion/opt/subversion/lib:$LIBPATH $ ./svn exec(): 0509-036 Cannot load program ./svn because of the following errors: 0509-022 Cannot load module /home/david/subversion/opt/subversion/lib/libsvn_client-1.so. 0509-150 Dependent module /opt/subversion/lib/libsvn_wc-1.so could not be loaded. 0509-022 Cannot load module /opt/subversion/lib/libsvn_wc-1.so. 0509-026 System error: A file or directory in the path name does not exist. 0509-022 Cannot load module svn. 0509-150 Dependent module /home/david/subversion/opt/subversion/lib/libsvn_client-1.so could not be loaded. 0509-022 Cannot load module . Any ideas at this point? I have successfully compiled Subversion 1.6.9 on both AIX 4.3 and 5.3. The following is for AIX 5.3 and with user dev. You will need to change all the reference to ~dev to the correct user (or different path altogether). Also, these instruction do not specify any --prefix, because I wanted to install SVN in the standard directory. However, I have used the exact same instruction for testing 1.6.9 prior to installation and it that case I used the --prefix. As long as you specify the same location for --prefix everything should work. cd ~dev gunzip -c subversion-deps-1.6.9.tar.gz | tar xvf - gunzip -c subversion-1.6.9.tar.gz | tar xvf - cd ~dev/subversion-1.6.9/apr CC=/usr/vac/bin/cc \ CFLAGS=-qmaxmem=-1 -O2 -qlanglvl=extended \ ./configure \ --enable-shared \ --enable-static make make install cd ~dev/subversion-1.6.9/apr-util/xml/expat CC=/usr/vac/bin/cc \ CFLAGS=-qmaxmem=-1 -O2 -qlanglvl=extended \ ./configure \ --enable-shared=yes make make install cd ~dev/subversion-1.6.9/apr-util CC=/usr/vac/bin/cc \ CFLAGS=-qmaxmem=-1 -O2 -qlanglvl=extended \ ./configure \ --with-apr=/usr/local/apr \ --with-expat=builtin make make install cd ~dev/subversion-1.6.9/neon CC=/usr/vac/bin/cc \ CFLAGS=-qmaxmem=-1 -O2 -qlanglvl=extended \ CPPFLAGS=-I/usr/local/include \ LDFLAGS=-brtl \ ./configure \ --with-expat=/usr/local/lib/libexpat.la \ --enable-shared=yes make make install cd ~dev/subversion-1.6.9 CC=/usr/vac/bin/cc \ CFLAGS=-qmaxmem=-1 -O2 -qlanglvl=extended \ CPPFLAGS=-I/usr/local/include \ LDFLAGS=-L/usr/local/lib \ ./configure \ --disable-shared \ --without-ssl \ --without-berkeley-db \ --with-apr=/usr/local/apr \ --with-apr-util=/usr/local/apr \ --without-apxs \ --with-neon=/usr/local \ --without-serf make make install I found that the order of the installation was important, e.g expat before apr-util. Also, you may need to use the --with-sqlite option when configuring Subversion to point to sqlite3.c in the Subversion dependency tree (I had SQLite installed). And obviously you can change other option to consifure Subversion for your needs. Giulio
RE: Subversion on AIX
Linedata Limited Registered Office: 85 Gracechurch St., London, EC3V 0AA Registered in England and Wales No 3475006 VAT Reg No 710 3140 03 -Original Message- From: David Weintraub [mailto:qazw...@gmail.com] Sent: 13 October 2010 16:01 To: Giulio Troccoli Cc: Subversion Subject: Re: Subversion on AIX I just tried building APR with your proceedure and socktest still fails. Did you run the tests? I suspect that this particular test might not be that important. I think I did, sorry I don't remember. If I did, it either passed or it was skipped. I'll try and run them again and let you know On Wed, Oct 13, 2010 at 3:49 AM, Giulio Troccoli giulio.trocc...@uk.linedata.com wrote: Linedata Limited Registered Office: 85 Gracechurch St., London, EC3V 0AA Registered in England and Wales No 3475006 VAT Reg No 710 3140 03 -Original Message- From: David Weintraub [mailto:qazw...@gmail.com] Sent: 12 October 2010 18:41 To: Subversion Subject: Subversion on AIX We are trying to get a Subversion install on an IBM AIX box we have here. Unfortunately, I really don't have root access to the box, and I know that our admins will probably not be very helpful in this endeavor. I do have gcc version 4.0.0, but I don't have the APR library. We don't plan to use Apache httpd, but just svnserve instead. I downloaded the Universal AIX tarball (only 1.4, but I'd be happy with anything now), and had problems since it was tarred up at the root of the directory. I used pax to untar the file, so I could put it under something besides /opts. The files are placed under /home/david. $ LIBPATH=/home/david/subversion/opt/subversion/lib:$LIBPATH $ ./svn exec(): 0509-036 Cannot load program ./svn because of the following errors: 0509-022 Cannot load module /home/david/subversion/opt/subversion/lib/libsvn_client-1.so. 0509-150 Dependent module /opt/subversion/lib/libsvn_wc-1.so could not be loaded. 0509-022 Cannot load module /opt/subversion/lib/libsvn_wc-1.so. 0509-026 System error: A file or directory in the path name does not exist. 0509-022 Cannot load module svn. 0509-150 Dependent module /home/david/subversion/opt/subversion/lib/libsvn_client-1.so could not be loaded. 0509-022 Cannot load module . Any ideas at this point? I have successfully compiled Subversion 1.6.9 on both AIX 4.3 and 5.3. The following is for AIX 5.3 and with user dev. You will need to change all the reference to ~dev to the correct user (or different path altogether). Also, these instruction do not specify any --prefix, because I wanted to install SVN in the standard directory. However, I have used the exact same instruction for testing 1.6.9 prior to installation and it that case I used the --prefix. As long as you specify the same location for --prefix everything should work. cd ~dev gunzip -c subversion-deps-1.6.9.tar.gz | tar xvf - gunzip -c subversion-1.6.9.tar.gz | tar xvf - cd ~dev/subversion-1.6.9/apr CC=/usr/vac/bin/cc \ CFLAGS=-qmaxmem=-1 -O2 -qlanglvl=extended \ ./configure \ --enable-shared \ --enable-static make make install cd ~dev/subversion-1.6.9/apr-util/xml/expat CC=/usr/vac/bin/cc \ CFLAGS=-qmaxmem=-1 -O2 -qlanglvl=extended \ ./configure \ --enable-shared=yes make make install cd ~dev/subversion-1.6.9/apr-util CC=/usr/vac/bin/cc \ CFLAGS=-qmaxmem=-1 -O2 -qlanglvl=extended \ ./configure \ --with-apr=/usr/local/apr \ --with-expat=builtin make make install cd ~dev/subversion-1.6.9/neon CC=/usr/vac/bin/cc \ CFLAGS=-qmaxmem=-1 -O2 -qlanglvl=extended \ CPPFLAGS=-I/usr/local/include \ LDFLAGS=-brtl \ ./configure \ --with-expat=/usr/local/lib/libexpat.la \ --enable-shared=yes make make install cd ~dev/subversion-1.6.9 CC=/usr/vac/bin/cc \ CFLAGS=-qmaxmem=-1 -O2 -qlanglvl=extended \ CPPFLAGS=-I/usr/local/include \ LDFLAGS=-L/usr/local/lib \ ./configure \ --disable-shared \ --without-ssl \ --without-berkeley-db \ --with-apr=/usr/local/apr \ --with-apr-util=/usr/local/apr \ --without-apxs \ --with-neon=/usr/local \ --without-serf make make install I found that the order of the installation was important, e.g expat before apr-util. Also, you may need to use the --with-sqlite option when configuring Subversion to point to sqlite3.c in the Subversion dependency tree (I had SQLite installed). And obviously you can change other option to consifure Subversion for your needs. Giulio -- David Weintraub qazw...@gmail.com
RE: Rename svn-repository
Linedata Limited Registered Office: 85 Gracechurch St., London, EC3V 0AA Registered in England and Wales No 3475006 VAT Reg No 710 3140 03 -Original Message- From: Dennis Borgmann [mailto:dennis.borgm...@googlemail.com] Sent: 23 September 2010 11:46 To: users@subversion.apache.org Subject: Rename svn-repository Hi subversion list! I would like to move a whole project to another name. Let's say, I have the project right now with a name called hello, and I would like to move its name to world, which commands would I have to issue? Afterwards each user should be able to check it out with this new name world, not anymore with the repository-name hello. Oh, and by the way all previous check-ins should still be accessible, so I don't want to create a new repository and copy all files and afterwards delete the old one, but simply rename it. If, as I understood, hello and world are and will be in the same repository then just use svn move. This will preserve the history. But can you explain what you mean by all previous check-ins should still be accessible? Once you have moved hello, that won't be accessible in the HEAD revision. G
Format of dump file from StarTeam repository
This is a bit OT I'm afraid. We are in the process of moving one project from StarTeam to Subversion. We are using the Polarion svnimporter script. We are also planning on using the svndumptool to do some reorganisation other little things before loading the dump into a new SVN repo. From the svndumptoll documentation I see that the dump must be version 2, i.e. be created with the --deltas option. Does anybody know if that's what svnimporter does? I have looked on the Polarion website but I didn't find an answer. Also, is there a way, from looking at the dump file, to know its version? Thanks Giulio Linedata Limited Registered Office: 85 Gracechurch St., London, EC3V 0AA Registered in England and Wales No 3475006 VAT Reg No 710 3140 03
RE: [SOLVED] Repository Directory Tree
It sounds like good advice. At least for the first few, I will check them out in an empty directory and compare them, then clear out the old directory and check them out into the one I really want to use. Once you have compared the two trees, you don't need to check out again. Simply delete the old tree and renamed the new one. Each working copy is self-contained and can be copied, renamed or moved. Linedata Limited Registered Office: 85 Gracechurch St., London, EC3V 0AA Registered in England and Wales No 3475006 VAT Reg No 710 3140 03
RE: Repository Directory Tree
Linedata Limited Registered Office: 85 Gracechurch St., London, EC3V 0AA Registered in England and Wales No 3475006 VAT Reg No 710 3140 03 -Original Message- From: Giulio Troccoli [mailto:giulio.trocc...@uk.linedata.com] Sent: Monday, September 13, 2010 3:52 AM To: anw-d...@infoisland.net; users@subversion.apache.org Subject: RE: Repository Directory Tree Please don't top post. On this ML the net-etiquette requires you to post your reply at the bottom Linedata Limited Registered Office: 85 Gracechurch St., London, EC3V 0AA Registered in England and Wales No 3475006 VAT Reg No 710 3140 03 -Original Message- From: Aladdin [mailto:alad...@csunv.com] Sent: 12 September 2010 19:56 To: users@subversion.apache.org Subject: RE: Repository Directory Tree Oops! Sorry- should ALWAYS RTFM!! I used svn up NetDataSvc --force, and it *seemed* to work! Is this what I should have done, and now will need to do for each project I check out for the first time after doing this? Regards, Allen -Original Message- From: Aladdin [mailto:alad...@csunv.com] Sent: Sunday, September 12, 2010 2:48 PM To: 'Giulio Troccoli'; users@subversion.apache.org Subject: RE: Repository Directory Tree Giulio, That seemed to work well, except now when I try to checkout one of my projects, I get this: anw-dev:/home/anw/TechProjects# svn co file:///var/svn/NetDataSvc . svn: Failed to add directory 'NotUsed': an unversioned directory of the same name already exists NotUsed contains, as the name implies, a couple of C++ and .h source files that I'm not currently using but wanted to hang on to. It is a subdirectory under NetDataSvc. From the error message I guess /home/anw/TechProjects was not empty when you tried the checkout. Using the --force option you have overwritten the content of /home/anw/TechProjects/NotUsed with whatever it was in the repository (it should have left untouched all those files that are not in the repository). I don't know whether that was what you should have done. Maybe, or maybe not. Only you can be the judge of that, because you know what was in that directory before you check your working copy out. As per having to do use --force every time, I wouldn't think so. I mean, you would need to make a judgement call if you already have a NotUsed directory, but if you do everytime, I would question why you do. I personally would check out a fresh new working copy in a non, yet, existing directory. G Sorry about the top post. I'm also active on another mailing list regarding dovecot where you are *supposed* to top post. Again maybe I should have RTFM'd! It's ok :-) Now you know OK- I think I understand. What the directory had in it was a copy of what I put into the repository; I hadn't made any changes since it went it went in, so it should be fine. All other directories similarly; so, if I understand correctly, if I delete them all first or just use --force to check them out, it should be the same. I'm not 100%. As I said I'm a bit uncomfortable in using the --force option. I'd rather check out in a new directory. G
RE: Help with Mac repositry permissions
Linedata Limited Registered Office: 85 Gracechurch St., London, EC3V 0AA Registered in England and Wales No 3475006 VAT Reg No 710 3140 03 -Original Message- From: Matthew Allen [mailto:f...@memecode.com] Sent: 08 September 2010 07:41 To: users@subversion.apache.org Subject: Help with Mac repositry permissions Hi I started a serverfault question about mac svn repo permissions: http://serverfault.com/questions/171647/what-are-the-correct-u sergroup-for-a-mac-svn-apache-install But haven't got any response yet, anyone on here care to help? You don't really say what the problem is, not here or in the serverfault report. I know you have set up Apache but do you access the repository using the http:// protocol? Or do you use svn:// or file:// ? Also, what are the permissions of /Users ? Giulio
Detecting CR eol
I am writing a pre-commit hook script in perl. One of the requirement is that all files (luckly they are all text files) have the svn:eol-style property set to LF and the actual eol is indeed LF. If that's not the case I will reject the commit and direct the user to a page on our intranet to explain what to do to fix it. My problem is how to detect whether the eol is LF and nothing else. I'm developing on Linux (Centos 5) and Perl 5.10. Subversion is 1.6.9, if it matters. I thought about using the dos2unix utility (we only use Windows or Linux) and then check that the file hasn't changed, but it seems a lot of processing. My second idea was to use a regular expression to check each line of each file. This way at least I would stop as soon as I find an eol that is not LF, saving some processing. I still need to svn cat each file into an array I think. I know this is a common requirement but I don't know whether anyone has already done it in Perl. I would be greatful for any comment or suggestions of course. Giulio Linedata Limited Registered Office: 85 Gracechurch St., London, EC3V 0AA Registered in England and Wales No 3475006 VAT Reg No 710 3140 03
RE: Help with Mac repositry permissions
Linedata Limited Registered Office: 85 Gracechurch St., London, EC3V 0AA Registered in England and Wales No 3475006 VAT Reg No 710 3140 03 -Original Message- From: Matthew Allen [mailto:f...@memecode.com] Sent: 08 September 2010 10:35 To: Giulio Troccoli Subject: RE: Help with Mac repositry permissions The problem is that I want to make sure this is secure, and the fact that it seems to be using the webserver seems to be using the global permissions indicates to me that the repo files are not being correctly protected. If someone gets into my machine then they can see the repo. I want to limit access to a) the webserver process or b) a local terminal user. Please respond to the list as well, usually by clicking on Reply-All. Also, don't top-post. Also the /Users folder perms is: drwxr-xr-x 6 root admin 204 18 Aug 10:03 Users Now, there's your answer. The user that runs theweb server, _www, has permission to access /Users only becuase of the others permissions __r-x. You could change the ownership of /Users to _www but I guess the /Users contains also the home directories of your users so this woldn't be acceptable. Why don't you create a directory directly under / owned by _www and access by _www only, for example mkdir /repos chown _www /repos chmod 700 /repos cp -R /Users/Svn /repos Check that the permission of /repos/Svn are still correct and then amend your web server configuration file so that the repository points to /repos/Svn and not /Users/Svn Giulio
RE: Detecting CR eol
I don't believe you have to go to so much trouble in the pre-commit hook. If you have set the svn:eol-style property then subversion will ensure the file has those line endings on checkout and update them when committing into the repository. So all the hook needs to do is check for the property. See the book for more details http://svnbook.red-bean.com/nightly/en/svn-book.html#svn.advan ced.props.special.eol-style I'm not sure. Are you saying that if I set the svn:eol-style property to LF, for example, and my file has at least one line ending with CRLF, then Subversion will reject the commit? The book doesn't quite say that, and that wasn't my understanding on how the property works. I'd also normally expect the line ending style to be set to native so windows and unix users don't trample the existing incompatible line endings. The only reason perhaps for checking each file explicitly would be if there was something else needing the files to be in a particular format, ie releases to customers from a developer machine rather than an official build server that would check out a clean copy each time. The requirement, to have LF, came a long time ago. I remeber having problems with svn:eol-style set to native. I think Subversion did not checkout the files with the correct EOL based on the platform, but maybe that was because the files were actually being committed with mixed EOLs. G Linedata Limited Registered Office: 85 Gracechurch St., London, EC3V 0AA Registered in England and Wales No 3475006 VAT Reg No 710 3140 03
RE: Renaming a branch
Is there a safe way to rename a branch? I'm worried about all my mergeinfo's If you have merged only from trunk and haven't merged from this branch, I don't see a problem in using s imple svn mv. Linedata Limited Registered Office: 85 Gracechurch St., London, EC3V 0AA Registered in England and Wales No 3475006 VAT Reg No 710 3140 03
RE: Repository Directory Tree
Linedata Limited Registered Office: 85 Gracechurch St., London, EC3V 0AA Registered in England and Wales No 3475006 VAT Reg No 710 3140 03 -Original Message- From: Allen Williams [mailto:alad...@csunv.com] Sent: 07 September 2010 12:24 To: users@subversion.apache.org Subject: RE: Repository Directory Tree I *think* that proj1/2/3 are separate projects inside one repository, but none of those distinctions were very clear to me (I DID read the manual, cover to cover). I certainly understand the concept of the equivalence between a directory and project (I think), but, to me, anyway, it's not clear the distinction between a repository and further directory structure. But now my memory returns: I only created ONE repository, so all those are projects under that repository. So /var/svn is a repository, created with svnadmin create /var/svn. The project where imported as var/svn/proj1, var/svn/proj2 and var/svn/proj3. So your projects do live in the var/svn directory in your repository (note there is no / at the beginning so I'm referring to the repository but a directory inside your repository). I would do the following (presuming you're on unix or linux) - check out the whole thing (it might be too big but maybe not) svn checkout file:///var/svn ~/tmp This will create a new directory called tmp in your home directory whit the whole of your repository. Insinde ~/tmp you will have var/svn/proj1, var/svn/proj2 and var/svn/proj3. - move the projects to the root of your repository cd ~/tmp svn move var/svn/proj1 proj1 svn move var/svn/proj2 proj2 svn move var/svn/proj3 proj3 Since you have used svn command the history will be preserved. - commit svn commit -mReorganising the projects Done. Now to see a list of your projects 'svn list file:///var/svn' will be enough. Giulio
Transaction and revision numbers
Is there a special format of a transaction number? I would like to write a method in perl that gets a number, either transaction or revision, and then adds the correct --revision or --transaction parameter (for the svnlook command). So if there is a special format for a transaction number I can use a regular expression to check it. Thanks Giulio Linedata Limited Registered Office: 85 Gracechurch St., London, EC3V 0AA Registered in England and Wales No 3475006 VAT Reg No 710 3140 03
RE: Repository Directory Tree
Linedata Limited Registered Office: 85 Gracechurch St., London, EC3V 0AA Registered in England and Wales No 3475006 VAT Reg No 710 3140 03 From: Allen Williams [mailto:a...@csunv.com] Sent: 06 September 2010 15:28 To: users@subversion.apache.org Subject: Fwd: Repository Directory Tree I send this email out about once a month or so in what is becoming the vain hope I'll get a response... My subversion repository is in /var/svn. Somehow (and, yes, I'm new; I'm evaluating it), I've wound up with the following directory structure in my subversion repository: /var/svn/ var/svn/proj1 var/svn/proj2 var/svn/proj3. In other words, to do a list of the repositories, I have to do: svn listfile:///var/svn/var/svn to get my projects listed. I've tried to do an svnadmin dump and load with --parent-dir, and that didn't work. This was the command line sequence after I had made a copy of the repository in /var/svn.sav: svnadmin dump /var/svn.sav old_repos rm -r/var/svn/* svnadmin create /var/svn svnadmin load --parent-dir / /var/svn old_repos But, even though I had parent-dir as / (to try to eliminate one of the /var/svn's), I still got /var/svn/var/svn/projects. What is the way to do this? TIA, Allen Is /var/svn one repository and proj1/2/3 directories inside it? or are proj1/2/3 three separate repositories? How did you create you repository or repositories?
Deleteing svn:mergeinfo after reintegration
I have a repostiory with the following svn:mergeinfo property on trunk /branches/DR:353-683 /branches/xplorer:589-623 Both DR and xplorer branches have been reintegrated and now deleted. Can I delete the mergeinfo then? The reason I'm asking is because now, when I merge trunk into other branches I have got these mergeinfo too, which I'm not interested in the least, and more than once they confused me. Giulio Troccoli Linedata Limited Registered Office: 85 Gracechurch St., London, EC3V 0AA Registered in England and Wales No 3475006 VAT Reg No 710 3140 03
RE: Use existing directory as repository
Linedata Limited Registered Office: 85 Gracechurch St., London, EC3V 0AA Registered in England and Wales No 3475006 VAT Reg No 710 3140 03 From: Tim Asplin [mailto:tim.asp...@gmail.com] Sent: 20 August 2010 10:29 To: users@subversion.apache.org Subject: Use existing directory as repository Hello, I have read through the manual, and looked at FAQ. But did not seam to find the answer. We have a web site, and directory structure to support it, what we want is to use subversion to now manage it. So want to use the existing structure of directories and files as the repository to check out files from, while also having the files running on the development web site so we can still use the website. In the manual it show you how to create a repository and how to import a existing folder into it, and in the FAQ how to create a repository and use files as working set. What we want to do is to turn the existing structure into the repository, is this possible, if so how. Were are running on windows. Thanks Tim The repository is where you store all your files and history. The working copy is a copy of the repository, or part of it, where you can do your work. So in your case you do want to use the existing structure to populate the repository, with the import facility as explained in the book, but the repository will be somewhere else, somewhere accessible by all your developers. If you decided to use the recommended trunk/branches/tags structure you would have your live website as a working copy (or maybe as an export) of a specific tag and use branches and trunk for development, i.e. your developers would create a working copy out of trunk or a branch and commit to it. Then, when your code passes the test, probably in a staging place, you can create a new tag and switch the live site to it. Hope this helps. I don't do website development (although I might start soon), this is what I gathered by reading the ML through the years. Giulio P.S. Please post in text-format only
RE: Restore all trunk!
Thnks But, I can rolback the revision on my working copy (NOW my working copy are 3243, and the SVN 3251), but not can commit this 'rollback' to trunk! because this revision already exists on SVN Server If you have reverse-merge the offending revisions than your working copy is at revision 3251. Can you tell us *exactly* what commands did you use? G Linedata Limited Registered Office: 85 Gracechurch St., London, EC3V 0AA Registered in England and Wales No 3475006 VAT Reg No 710 3140 03
RE: Restore all trunk!
We have two servers(stagging and production), one development machine and one repository SVN server separated. Do you mean to say that the staging and production machines have a working copy of the same SVN repository? If you have reverse-merge the offending revisions than your working copy is at revision 3251. Can you tell us *exactly* what commands did you use? You haven't told us what command you used! Or maybe you didn't even try to reverse-merge? If so: - update your working copy with svn update. This will take your working copy to revision 3251 - look at the log and take a note of the revisions you have to take out - issue the merge command as follows for each of those revisions, from the highest to the lowest: svn merge -c-rev The dash after the c and before the revision is the bit that tells Subversion to reverse-merge the changes rather than re-apply them - check the status of your working copy to see that it is exactly how you want it - commit Linedata Limited Registered Office: 85 Gracechurch St., London, EC3V 0AA Registered in England and Wales No 3475006 VAT Reg No 710 3140 03
RE: Subversion Client Not Accessible
Linedata Limited Registered Office: 85 Gracechurch St., London, EC3V 0AA Registered in England and Wales No 3475006 VAT Reg No 710 3140 03 From: suman.mai...@asia.bnpparibas.com [mailto:suman.mai...@asia.bnpparibas.com] Sent: 17 August 2010 13:24 To: users@subversion.apache.org Subject: Subversion Client Not Accessible Importance: High Hi, I'm looking for the subversion client for AIX. I got one from http://www.open.collab.net/downloads/community/ http://www.open.collab.net/downloads/community/ but this file is corrupted and not able to installing. Please provide some good svn client fro AIX machine to checkout and checking the files from SVN Very urgent please. Thanks Regards, Sunny The Subversion project does not provide packages, only sources. However, like you discovered, others provides nice packages for you to use. I don't know why the CollabNet package doesn't work, but I know Michael Perzl maintains (or at least it did) some RPM for Subversion. Check http://www.oss4aix.org/download/latest/ then click on the version of AIX you have and see if you find what you're looking for. I haven't tested them myself as I build SVN from source. Please do not send in HTML. Giulio
RE: How to build GNOME Keyring for Subversion
Linedata Limited Registered Office: 85 Gracechurch St., London, EC3V 0AA Registered in England and Wales No 3475006 VAT Reg No 710 3140 03 -Original Message- From: Yudong Sun [mailto:yud...@nag.co.uk] Sent: 12 August 2010 12:12 To: Giulio Troccoli Subject: Re: How to build GNOME Keyring for Subversion Giulio, But how did you build GNOME Keyring from source? Which version of G-K did you use? I'm trying to build G-K 2.28.2 which has so many dependencies, very discouraging to continue. Ah, but that's not what you asked :-) No, I didn't build it from source, I used the CentOS package manager, yum. Oh and please stop top-posting Giulio
RE: Update deleted local changes after rollback
Linedata Limited Registered Office: 85 Gracechurch St., London, EC3V 0AA Registered in England and Wales No 3475006 VAT Reg No 710 3140 03 From: erlend olsen [mailto:eolse...@hotmail.com] Sent: 12 August 2010 13:53 To: users@subversion.apache.org Subject: Update deleted local changes after rollback Hi all, me and my colleague have lost big changes in our code... here's a quick summary: repository has these files: x y z A: commits changes to all the files and adds 2 new files repository now has these files: p q x y z B: Sees that these changes f**ks up the whole program and he rollbacks to only x,y,z A: keeps his changes locally and keeps changing them until they work... B: commits new code. A: is happy because now everything works on his local copy. Then he pushes 'update' in netbeans before he commits. SVN: now deletes all of A's changes and new files.. A: screams in terror and tries to get back his files... but not a chance... He can get the changes he committed before the rollback, but the real big changes are now deleted Is there a way to undo this update? Or to save us the next time, is there a way to take a local backup before updating??? Please help we're desperate here... Its about 1 week of programming down the toilet... Erlend Olsen How exactly did he rollback to only x,y,z? Please, do not post in HTML. Giulio
RE: How to build GNOME Keyring for Subversion
Linedata Limited Registered Office: 85 Gracechurch St., London, EC3V 0AA Registered in England and Wales No 3475006 VAT Reg No 710 3140 03 -Original Message- From: Yudong Sun [mailto:yud...@nag.co.uk] Sent: 09 August 2010 13:29 To: users@subversion.apache.org Subject: How to build GNOME Keyring for Subversion Hi, I am trying to build Subversion 1.6.12 with GNOME Keyring support. I have tried GNOME Keyring 2.30.3 downloaded from http://linux.softpedia.com/get/Utilities/gnome-keyring-13111.shtml The configure and make of this GNOME Keyring version have been done with two pkg-config files created: gcr-0.pc and gp11-0.pc but no gnome-keyring-1.pc generated. I have also tried to install GNOME Keyring 2.28.2 downloaded from http://www.linuxfromscratch.org/blfs/view/svn/gnome/gnome-keyring.html This version has an endless list of dependencies: GNOME Keyring 2.28.2: GConf-2.28.0, GTK+-2.18.7, intltool-0.40.6, Libgcrypt-1.4.5, and libtasn1-2.5 GConf-2.28.0: ORBit2-2.14.17 and polkit-0.94 polkit-0.94: D-Bus GObject Bindings-0.5, intltool-0.40.6, Linux-PAM-1.1.1, gobject-introspection-0.6.8, and DocBook XML DTD-4.5 ... ... That looks terrifying. I am almost giving up midway I'd like to know your experience on building subversion with GNOME Keyring. Which GNOME Keyring version works well with svn 1.6.12 and is there an easier way to do it? Your advice will be much appreciated. You don't say which flavour of Linux, but if you have a package manager, like yum or apt-get for example, it's much easier as they take care of all the dependencies. Having said that, I personally had a hell of a time (and gave up for the time being) to unlock the keyring upon login. Once the keyring is unlocked the everything is fine, but I can't seem to be able to avoid entering the keyring password. Giulio
RE: Post-commit hook doesn't run after a failed commit
The TortoiseSVN manual states Post-commit - Called after the commit finishes (whether successful or not). The Subversion documentation, which is the one that is mandatory, says that the post-commit hook is only run when a new revision was created, see the link below. I might be wrong but I think the Tortoise manual refers to Tortoise post-commit hook, which is a client hook, which is different form the Subversion post-commit hook that runs on the server. Giulio Linedata Limited Registered Office: 85 Gracechurch St., London, EC3V 0AA Registered in England and Wales No 3475006 VAT Reg No 710 3140 03
RE: Question about mergeinfo
Another question: we do revision based merging, promoting stories/goals not necessarily in the same order they were committed in the trunk. Besides helping in tracing the changes in the branch the the original logs, is there any other utility in having the mergeinfo information? I can't help you much about the mergeinfo, but are you saying here that you *only* do revision based merging, a.k.a. cherry-picking merging? Becuase if that's the case you don't need the mergeinfo at all and you can use the --ignore-ancestry option of the merge command to not store any mergeinfo. The history is preserved regardless of the mergeinfo. But, you probably mean you do cherry-picking merging from trunk to branch and then reintegrate the branch to trunk, so you do need mergeinfo. Giulio Linedata Limited Registered Office: 85 Gracechurch St., London, EC3V 0AA Registered in England and Wales No 3475006 VAT Reg No 710 3140 03
RE: Question about mergeinfo
Of course, --ignore-ancestry will also, well ignore ancestry, and only do a diff. So, if you have a file with the same name as an earlier file with the same path/name that is not actually its parent you are going to get a bad merge. Sorry, I'm a bit lost here. Could you explain this maybe with an example? Linedata Limited Registered Office: 85 Gracechurch St., London, EC3V 0AA Registered in England and Wales No 3475006 VAT Reg No 710 3140 03
RE: viewing svn logs?
What about TortoiseSVN? Linedata Limited Registered Office: 85 Gracechurch St., London, EC3V 0AA Registered in England and Wales No 3475006 VAT Reg No 710 3140 03 From: Tom Cruickshank [mailto:tcruic...@gmail.com] Sent: 06 August 2010 15:54 To: users@subversion.apache.org Subject: viewing svn logs? Hey Guys, Wondering if there is any software out there (open source or proprietary) which would allow someone to view SVN logs in a gui based environment? What do you folks typically use if you don't mind me asking? Tom
RE: SVN Relay
And if you decide to use svnsync for mirroring, note that the way the book describes the mirroring setup is vulnerable to a race condition. Make sure to read this issue: http://subversion.tigris.org/issues/show_bug.cgi?id=3546 To avoid the problem described in issue #3546, you should make the mirror repository pull changes from the master via a cronjob, and synchronise svnsync jobs using a file lock on the computer hosting the mirror repository. Only one svnsync job must be writing to the mirror repository at a time, or you risk breaking sync jobs. So do not push revisions from the master to the mirror via the post-commit hook (which is what the book suggests). Something like the following should work from a crontab on Linux systems: 0 * * * * flock -w 60 /tmp/svnsync.lock svnsync sync file:///path/to/repository/mirror We're working on fixing this problem such that the way the book describes it will work without a race condition, but that work is not yet complete. A bit OT, I just want to check that this (the race condition) does not apply to two svnsync processes trying to sync two different repositories. I use svnsync to keep our DR server up-to-date. We have very few people committing to the various repositories so it's more likely (and still it's not that likely) that two people commit to two different repositories than to the same one, so I just wanted to check thise scenario with you. Giulio Linedata Limited Registered Office: 85 Gracechurch St., London, EC3V 0AA Registered in England and Wales No 3475006 VAT Reg No 710 3140 03
RE: svn deployment help
I don't think such a tool exist but we use svn:externals to do something similar. Basically we have a folder called Public that contains the documentation available to customers. We then set svn:externals on that folder pointing to the docs we want to make public. The web server just checkouts and update this folder and not the whole repository. Giulio Linedata Limited Registered Office: 85 Gracechurch St., London, EC3V 0AA Registered in England and Wales No 3475006 VAT Reg No 710 3140 03 From: Tom Cruickshank [mailto:tcruic...@gmail.com] Sent: 20 July 2010 11:47 To: users@subversion.apache.org Subject: svn deployment help Hey Guys, I'm doing research on svn and wondering if anyone might have an ideas for this. I'm setting up SVN so that I have a SVN repository on my development machine which will then be able to deploy files to my production environment. I'd like to be able to pick and choose which files I want to deploy (not automatically deploy all the files which have been recently committed, using hooks). I'd also like to (preferably) have a GUI based tool (web based also works) to choose the files and then have them deployed to the production environment. Does this type of deployment tool exist? Would appreciate assistance. Thanks! Tom
RE: Getting started with subversion
Okay, with those preliminaries out of the way, open the Terminal and do the following. The $ will represent your command prompt. This can be changed, so in Unix, it is common just to put $: $ cd $HOME $ svn mkdir svn_repos $ cd mkdir svn_repos $ svnadmin create newrepo This will create a Subversion repository at /Users/TommyHome/svn_repos called newrepo. You can find this in Pathfinder. Now, you will want to create a working directory: $ cd $HOME $ svn checkout file://$PWD/svn_repos/newrepo svn_project I think this should be $ svn checkout file:///$HOME/svn_repos/newrepo I know that with the cd command before, $PWD and $HOME are the same, but it's safer to use $HOME, as it will always point to the correct location. Also, notice the three /. According to the book you should either have file://localhost/$HOME... Or file:///$HOME... However I tried on a RHEL and file://$HOME works too Giulio Linedata Limited Registered Office: 85 Gracechurch St., London, EC3V 0AA Registered in England and Wales No 3475006 VAT Reg No 710 3140 03
RE: Getting started with subversion
I think this should be $ svn checkout file:///$HOME/svn_repos/newrepo Except that now your working copy will get created with the name newrepo which is weird since it's not a repo, it's a working copy. So from the original example, $ svn checkout file://$HOME/svn_repos/newrepo svn_project would be clearer. Sorry, my mistake. I was focusing on the $HOME bit and I forgot the svn_project. You're absolutely right Linedata Limited Registered Office: 85 Gracechurch St., London, EC3V 0AA Registered in England and Wales No 3475006 VAT Reg No 710 3140 03
Common authorisation
I am trying to make some common authorisation for all my repositories. This is useful for example to give a particular user or a group of users, svn admins in my case, read-write permissions in all repositories. I thought I could have two AuthzSVNAccessFile in my Location in the Apache confi, but only the second one is considered. I have tried having two files in the AuthzSVNAccessFile but it doesn't. The reason I tried this approach is because I can have more that one authentication file with multiple AuthUserFile, so I thought that maybe I could do the same for authorisation. Anyway, another approach would be to be able to have some kind of #include in the access file themselves. For example myrepo.access: #include common.access [groups] dev = gt, hp [/] @dev = r [/trunk] @dev = rw And common.access: [groups] admins = svn_gt [/] @admind = rw The idea here is user svn_gt will have read-write access to the root of the repository, while gt and hp will only have read access Is this possible? I haven't tried #include because it would be interpreted as a comment. It's just an example, I was simply wondering if such feature is available or not. If that's not possible, does anyone have any suggestion on how I could achieve this? Thanks Giulio Linedata Limited Registered Office: 85 Gracechurch St., London, EC3V 0AA Registered in England and Wales No 3475006 VAT Reg No 710 3140 03
RE: fixing files committed with wrong eol-style
Hello, Without the svn:eol-style property any file content is considered as binary. At that point, checkouted files on Windows and Linux have CR-LF eol. ASAIK this is not true. Subversion has a clever way to tell whether a file is text or binary by looking at the file itself. I believe that you can trick Subversion by setting svn:mime-type, although I'm not sure why someone would want to treat a binay file as text or vice-versa. Giulio Linedata Limited Registered Office: 85 Gracechurch St., London, EC3V 0AA Registered in England and Wales No 3475006 VAT Reg No 710 3140 03
Accepting SSL certificates
I am trying to set Subversion to use https. I have already acquired a certificate from the company CA and set everything up in Apache. If if use https the I am asked to accept that the certificate comes from a trusted authority. If I accept it everything works. So, I have been instructed to download the company certificate and I'm trying to set it as a trusted CA. I have added the following to ~/.subversion/servers ssl-authority-files = /home/svn/LDS.crt It's not .pem, but I have been told that it is PEM-encoded. However, if I try with https I get the following error svn: Invalid config: unable to load certificate file '/home/svn/LDS.crt' I thought it was a permission issue but the file was readable by everyone, and the user who runs Apache is svn as well so Apache (if involved at all) can read it too. The server is CentOS 5, SVN is 1.6.9 and Apache is 2.2.13. Finally, I know I could accept it permanently but eventually I want to set the ssl-authority-files parameter on the system-wide subversion configuration so that all users automatically accept it. Thanks Giulio Linedata Limited Registered Office: 85 Gracechurch St., London, EC3V 0AA Registered in England and Wales No 3475006 VAT Reg No 710 3140 03
RE: Accepting SSL certificates
Linedata Limited Registered Office: 85 Gracechurch St., London, EC3V 0AA Registered in England and Wales No 3475006 VAT Reg No 710 3140 03 -Original Message- From: Boris Epstein [mailto:borepst...@gmail.com] Sent: 08 July 2010 13:28 To: Giulio Troccoli Cc: users@subversion.apache.org Subject: Re: Accepting SSL certificates On Thu, Jul 8, 2010 at 5:37 AM, Giulio Troccoli giulio.trocc...@uk.linedata.com wrote: I am trying to set Subversion to use https. I have already acquired a certificate from the company CA and set everything up in Apache. If if use https the I am asked to accept that the certificate comes from a trusted authority. If I accept it everything works. So, I have been instructed to download the company certificate and I'm trying to set it as a trusted CA. I have added the following to ~/.subversion/servers ssl-authority-files = /home/svn/LDS.crt It's not .pem, but I have been told that it is PEM-encoded. However, if I try with https I get the following error svn: Invalid config: unable to load certificate file '/home/svn/LDS.crt' I thought it was a permission issue but the file was readable by everyone, and the user who runs Apache is svn as well so Apache (if involved at all) can read it too. The server is CentOS 5, SVN is 1.6.9 and Apache is 2.2.13. Finally, I know I could accept it permanently but eventually I want to set the ssl-authority-files parameter on the system-wide subversion configuration so that all users automatically accept it. Thanks Giulio I remember dealing with it - and I think it is normal that a user has to accept the certificate once. I may be wrong but I thinkl this may be by design. Boris. Thanks Boris, but apparently it was not a PEM-encoded certificate gr Anyway, after I got the right certificate (and I fix some other little things) it works. So, if anyone is reading this from the archive, ssl-authority-files works just as expected. Giulio
RE: How can I retrieve the version of subversion itself?
Linedata Services (UK) Ltd Registered Office: Bishopsgate Court, 4-12 Norton Folgate, London, E1 6DB Registered in England and Wales No 3027851VAT Reg No 778499447 -Original Message- From: alibeck [mailto:alexander.beck-rat...@aei.mpg.de] Sent: 07 May 2010 08:14 To: users@subversion.apache.org Subject: How can I retrieve the version of subversion itself? Hello list, how can I obtain a version information about an installed subversion client and server? svn --version G
Svndumpfilter option
I am a bit confused by the use --drop-empty-revs and --renumber-revs. In my view, --renumber-revs is useless. Let's suppose that I have 3 directories in my repository: A committed in revision 1, B in revision 2 and C in revision 3 If I run svndumpfilter exclude B dumpfile I expect revision 2 to be empty, but still there. If I run svndumpfilter exclude B --drop-empty-revs dumpfile I expect revision 2 to not be there at all, and therefore revision 3 becomes revision 2. I don't see the use of --renumber-revs. Am I missing something? G Linedata Services (UK) Ltd Registered Office: Bishopsgate Court, 4-12 Norton Folgate, London, E1 6DB Registered in England and Wales No 3027851VAT Reg No 778499447
RE: Common name for transaction and revision object
If you look at the svn_fs.h API, they are both referred to as revision roots. svn_fs_revision_root() and svn_fs_txn_root() both return a svn_fs_root_t * object. That does not sound like they're both being referred to as revision roots; that sounds like they're both being referred to as roots. If you're just looking to name a variable, you can call it RevisionOrTransaction. I'm trying to name a class that will hold information about a transaction (during pre-commit) or a revision (during post-commit). Because the information is pretty much the same, e.g path, url, files changes, log message, etc., I thought I could have a common class and then either use it in both pre- and post-commit hooks or use it as a parent class of more specialised Transaction and. Revision classes. I'm working in Perl, btw. I'm leaning towards calling it TxnRev to be honest. G Linedata Services (UK) Ltd Registered Office: Bishopsgate Court, 4-12 Norton Folgate, London, E1 6DB Registered in England and Wales No 3027851VAT Reg No 778499447
RE: Common name for transaction and revision object
Linedata Services (UK) Ltd Registered Office: Bishopsgate Court, 4-12 Norton Folgate, London, E1 6DB Registered in England and Wales No 3027851VAT Reg No 778499447 -Original Message- From: Geoff Rowell [mailto:geoff.row...@gmail.com] Sent: 22 April 2010 14:21 To: Giulio Troccoli Cc: users@subversion.apache.org Subject: RE: Common name for transaction and revision object Giulio Troccoli giulio.trocc...@uk.linedata.com wrote: I'm writing the hooks for a new repository in Perl and I'm exploring using OO Perl. In both pre- and post-commit hooks I need the list of files, the author and other similar information. My idea was to define a class and create an instance of that class given either the transaction number adn repository path or the revision number and the repository URL. The 'new' function will then initialise all the information I need calling either svnlook or svn. For instance: my $transaction = new Transaction($txn, $repo_path); Or my $commit = new Commit($rev, $repo_url); As you can see they are almost the same, so it would be nice to have a single class (I could then check the second parameter to see if it's a URL or a path and do things accordingly). But I cannot come up with a single name that would encompass both, and that's what I'm asking the list. So, any suggestions? Sorry, for posting again but I haven't received any suggestions regarding the name. Nobody can come up with anything? Really? G
RE: Compiling Subversion on AIX
Linedata Services (UK) Ltd Registered Office: Bishopsgate Court, 4-12 Norton Folgate, London, E1 6DB Registered in England and Wales No 3027851VAT Reg No 778499447 -Original Message- From: dig1tal.coo...@gmail.com [mailto:dig1tal.coo...@gmail.com] On Behalf Of Robert Cooper Sent: 28 April 2010 15:23 To: Giulio Troccoli; users@subversion.apache.org Subject: Re: Compiling Subversion on AIX Thanks for the help Giulio. Using that configure statement (with gcc): CC=gcc LDFLAGS=-L/usr/local/lib ./configure -C --disable-shared --without-ssl \ --without-berkeley-db --prefix=/usr/local/svn--with-apr=/usr/local/apr --with-apr-util=/usr/local/apr-util \ --without-apxs --without-serf --disable-nls helped me get to the make install but now I'm getting the following error: /usr/svn/subversion-1.6.11/build/install-sh -c -m 644 ./subversion/svnsync/svnsync.1 /usr/local/svn/share/man/man1/svnsync.1 /usr/svn/subversion-1.6.11/build/install-sh -c -m 644 ./subversion/svnversion/svnversion.1 /usr/local/svn/share/man/man1/svnver sion.1 subversion/svnversion/svnversion . /repos/svn/trunk /usr/local/svn/include/subversion-1/svn-revision.txt Could not load program /usr/svn/subversion-1.6.11/subversion/svnversion/.libs/lt-svnversion: Could not load module /usr/svn/subversion-1.6.11/subversion/libsvn_subr/.libs/libsvn _subr-1.so. Dependent module /usr/local/apr-util/lib/libexpat.a(libexpat.so.1) could not be loaded. Member libexpat.so.1 is not found in archive Could not load module lt-svnversion. Dependent module /usr/svn/subversion-1.6.11/subversion/libsvn_subr/.libs/libsvn _subr-1.so could not be loaded. Could not load module . make: The error code from the last command is 255. Stop. Any ideas on what might be stopping the install? expat? Did you use my exact configure? Because that was just the last part of a process where I built other things manually, e.g. expat that in your case make can't find. I was only suggesting to use CC, CFLAGS, etc. to specify another compiler and options. G
Common name for transaction and revision object
Hello guys, I'm writing the hooks for a new repository in Perl and I'm exploring using OO Perl. In both pre- and post-commit hooks I need the list of files, the author and other similar information. My idea was to define a class and create an instance of that class given either the transaction number adn repository path or the revision number and the repository URL. The 'new' function will then initialise all the information I need calling either svnlook or svn. For instance: my $transaction = new Transaction($txn, $repo_path); Or my $commit = new Commit($rev, $repo_url); As you can see they are almost the same, so it would be nice to have a single class (I could then check the second parameter to see if it's a URL or a path and do things accordingly). But I cannot come up with a single name that would encompass both, and that's what I'm asking the list. So, any suggestions? Thanks Giulio Linedata Services (UK) Ltd Registered Office: Bishopsgate Court, 4-12 Norton Folgate, London, E1 6DB Registered in England and Wales No 3027851VAT Reg No 778499447
RE: Common name for transaction and revision object
Giulio Troccoli giulio.trocc...@uk.linedata.com wrote: I'm writing the hooks for a new repository in Perl and I'm exploring using OO Perl. In both pre- and post-commit hooks I need the list of files, the author and other similar information. My idea was to define a class and create an instance of that class given either the transaction number adn repository path or the revision number and the repository URL. The 'new' function will then initialise all the information I need calling either svnlook or svn. For instance: my $transaction = new Transaction($txn, $repo_path); Or my $commit = new Commit($rev, $repo_url); As you can see they are almost the same, so it would be nice to have a single class (I could then check the second parameter to see if it's a URL or a path and do things accordingly). But I cannot come up with a single name that would encompass both, and that's what I'm asking the list. So, any suggestions? Sounds like you're duplicating the Subversion Hook Framework. http://sourceforge.net/projects/svnhook Well, not really. It's sounds like a very interesting project and I think it should be publicised more, but it's not really suitable for my case (I think). We use our in-house bug-tracking system and both pre- and post-commit hooks have to interact with that. This does not include only checking if the bug number is correct, but also if the issue has the correct status, if we are committing in the correct branch, etc. I'm sure that could be done with that framework (but please correct me if I'm wrong). Giulio Linedata Services (UK) Ltd Registered Office: Bishopsgate Court, 4-12 Norton Folgate, London, E1 6DB Registered in England and Wales No 3027851VAT Reg No 778499447
RE: Compiling Subversion on AIX
Linedata Services (UK) Ltd Registered Office: Bishopsgate Court, 4-12 Norton Folgate, London, E1 6DB Registered in England and Wales No 3027851VAT Reg No 778499447 From: dig1tal.coo...@gmail.com [mailto:dig1tal.coo...@gmail.com] On Behalf Of Robert Cooper Sent: 22 April 2010 14:45 To: users@subversion.apache.org Subject: Compiling Subversion on AIX Hello, I'm trying to compile subversion 1.6.11 source on AIX 6.1 TL3 using gcc 4.2.0-3. I have already compiled apache httpd 2.2.15 and have it working. (with ldap, dav, and authnz) My end goal is to have subversion running on AIX with apache and LDAP authentication to a Tivoli Directory Server. I have tried following these procedures with no success: http://www.tek-tips.com/viewthread.cfm?qid=1372779page=8 Here is what I used for configure: CC=gcc ./configure -C --prefix=/usr/local/svn --with-apr=/usr/local/apr --with-apr-util=/usr/local/apr-util --with-apache-libexecdir=/usr/local/apache2/modules My problem is that subversion fails during the make process. Here is the error that I get: /usr/local/apr/build-1/libtool --silent --mode=link gcc -Wl,-brtl -L/opt/IBM/ldap/V6.1/lib -rpath /usr/local/svn/lib -o libserf-0.la /usr/local/apr-util/lib/libaprutil-1.la -libmldapn -lexpat -liconv /usr/local/apr/lib/libapr-1.la -lpthread -lm -lz -lssl -lcrypto Usage: nm [-ACfhlprTv] [-B|-P] [-e|-g|-u] [-d|-o|-x|{-t [d|x|o]}] [-X{32|64|32_64|d64|any}] [--] File ... /usr/local/apr/build-1/libtool --silent --mode=compile gcc -g -O2 -pthread -U__STR__ -D_THREAD_SAFE -D_LARGEFILE64_SOURCE -I. -I/usr/local/apr/include/apr-1 -I/usr/local/apr-util/include/apr-1 -I/opt/IBM/ldap/V6.1/include -c -o test/serf_get.lo test/serf_get.c touch test/serf_get.lo /usr/local/apr/build-1/libtool --silent --mode=link gcc -Wl,-brtl -L/opt/IBM/ldap/V6.1/lib -static -o test/serf_get /usr/local/apr-util/lib/libaprutil-1.la -libmldapn -lexpat -liconv /usr/local/apr/lib/libapr-1.la -lpthread -lm -lz -lssl -lcrypto ld: 0711-317 ERROR: Undefined symbol: .main ld: 0711-345 Use the -bloadmap or -bnoquiet option to obtain more information. collect2: ld returned 8 exit status make: The error code from the last command is 1. Stop. make: The error code from the last command is 1. Stop. I'm thinking there might be an issue with openssl but I'm not sure where the error is and any help or direction would be greatly appreciated. Thanks, Robert I don't know if this is going to help, but I succesfully build 1.6.9 on AIX 5.3. I did have some troubles and my final config was CC=/usr/vac/bin/cc \ CFLAGS=-qmaxmem=-1 -O2 -qlanglvl=extended \ CPPFLAGS=-I/usr/local/include \ LDFLAGS=-L/usr/local/lib \ ./configure \ --disable-shared \ --without-ssl \ --without-berkeley-db \ --with-apr=/usr/local/apr \ --with-apr-util=/usr/local/apr \ --without-apxs \ --with-neon=/usr/local \ --without-serf Of course, change the options to configure as you desire, I only wanted to point out the CC, CFLAGS, etc. Oh, please try and post in text only, no HTML :-) Giulio
RE: hook-script doesn't run in background
I need to run an ant script after a commit, so I used a post-commit script for that. However, even if I put the ant call into the background and redirect stdout and stderr, it still returns only after the ant call is done. I found an old discussion about this (http://svn.haxx.se/dev/archive-2006-01/0375.shtml), is there still no workaround or fix? This is the relevant part of the script (commenting it out fastens it): ant all -f MDM-Leitfaden/ant_scripts/mdm-leitfaden.xml /tmp/dita.log 21 It looks like your post-commit hooks is a ksh, so have you tried adding at the end? Like ant all -f MDM-Leitfaden/ant_scripts/mdm-leitfaden.xml /tmp/dita.log 21 G Linedata Services (UK) Ltd Registered Office: Bishopsgate Court, 4-12 Norton Folgate, London, E1 6DB Registered in England and Wales No 3027851VAT Reg No 778499447
RE: killer feature -- HEAD+1
Linedata Services (UK) Ltd Registered Office: Bishopsgate Court, 4-12 Norton Folgate, London, E1 6DB Registered in England and Wales No 3027851VAT Reg No 778499447 -Original Message- From: Bob Archer [mailto:bob.arc...@amsi.com] Sent: 21 April 2010 15:35 To: Daniel Shahaf; David Brodbeck Cc: users@subversion.apache.org Subject: RE: killer feature -- HEAD+1 Hi David, David Brodbeck wrote on Tue, 20 Apr 2010 at 14:31 -0700: I'm more interested in the feature suggested by the +1 in the subject line -- the ability to get *future* revisions that haven't been committed yet. Just think, you could start a new project, then check out HEAD+8972 and get finished, debugged code! ;) This feature is available in Subversion 2.0. Please checkout https://svn.apache.org/repos/asf/subversion/tags/2.0.0/@HEAD+14310700 and give it a spin. Thanks, Daniel Thank link seems to be broken. This one works much better: http://tinyurl.com/y77qy9c You guys. LOL
RE: SVN MOVE don't perform a delete in some case
Linedata Services (UK) Ltd Registered Office: Bishopsgate Court, 4-12 Norton Folgate, London, E1 6DB Registered in England and Wales No 3027851VAT Reg No 778499447 -Original Message- From: Stefan Sperling [mailto:s...@elego.de] Sent: 16 April 2010 08:52 To: Yann Crueghe Cc: users@subversion.apache.org Subject: Re: SVN MOVE don't perform a delete in some case On Fri, Apr 16, 2010 at 09:40:34AM +0200, Yann Crueghe wrote: Hi ! Hi! *Test 1 : Try to rename a directory BRANCHE to BRANCHE_1* *Command :* svn move --message Rename BRANCHE to BRANCHE_1 http://tetris.agora.msanet:16060/svn/METIER/y78amodifier/branches/BRAN CHE http://tetris.agora.msanet:16060/svn/METIER/y78amodifier/branches/BRAN CHE_1 *Hook params :* D y78amodifier/branches/BRANCHE/ *Command result : * A repository hook failed svn: Commit blocked by pre-commit hook (exit code 1) with output: It's not allowed to rename or delete a branch. *Test 2 : Try to rename a directory BRANCHE to BRANCH* *Command :* svn move --message Rename BRANCHE to BR http://tetris.agora.msanet:16060/svn/METIER/y78amodifier/branches/BRAN CHE http://tetris.agora.msanet:16060/svn/METIER/y78amodifier/branches/BR *Hook params :* A y78amodifier/branches/BRANCH/ *Command result : * Commit done without error. Do you think it's a bug ? I don't know. On the surface this looks like a bug, but we need to find out what the real problem is. For that, you'll need to help others reproduce this problem on their own machines. Can you try to show a list of commands that starts by creating an empty repository, imports some files or folders, installs the hook script, and then runs some svn commands to trigger the problem? I should see the whole pre-commit hook but I think you parse the list of files being committed and rely on some kind of order, e.g. the deletion being the first of the list. I had a similar situation and I found out that (and this is documented) you can not rely on the order of the output of svnlook changed (or any other commands for that matter). So, I think you will have to parse the whole list of files and if there is a delete then exit with an error. Again, this is just hypothetical, as I don't know your pre-commit hook. G