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? Thanks Jochen
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?
Client error when doing server side proplist
Hi all, When doing a server side "proplist" I get the following diagnostic message: >svn pl -R http://full-path-to-repo/Proja/trunk/ExecShell.cpp svn: PROPFIND of '/path-to-repo/!svn/bc/1370/ProjA/trunk/ExecShell.c pp': 207 Multi-Status (http://name-of-server) I only get this for a few files. Running 'svnadmin verify' on the repository does not indicate anything wrong. Please advice. Regards /Daniel Widenfalk
Re: Periodically merge between trunk->branch and branch->trunk
On Thu, Dec 9, 2010 at 20:27, Kris Deugau wrote: > Daniel Albuschat wrote: >> >> I'd like to create a branch from trunk and periodically merge trunk >> into my branch to stay up to date with what happens in trunk. >> At some point, the feature in my branch reaches a kind of stability >> that is OK for trunk, so I merge it back to trunk. >> The difference to the standard situation is that I want to continue >> working on the branch, because the feature is not completely finished, >> yet, or it needs further enhancement. >> Currently the only solution I see is to reintegrate the branch to >> trunk and then re-create the branch. This has the shortcoming that all >> developers working on the branch have to switch to the new branch >> (although it is the same URL) to be able to work with it, right? This >> is ok when I'm working alone on my branch, but with a development >> team, it becomes tricky to make sure that everyone properly switch to >> the new branch. > > This is covered in the book: > > http://svnbook.red-bean.com/nightly/en/svn.branchmerge.advanced.html#svn.branchmerge.advanced.reintegratetwice Before going down that route, be sure to have understood the implications of issue 3650: http://subversion.tigris.org/issues/show_bug.cgi?id=3650 short summary: this technique renders `svn log --use-merge-history` useless. // Ben
RE: SVN Statistics
> -Original Message- > From: Gavin Beau Baumanis [mailto:b...@palcare.com.au] > Sent: 10 December 2010 04:46 > To: Subversion Users > Subject: SVN Statistics > > Hi Everyone, > > I have been asked for some statistics about our code base and am hoping > that someone might have had a task for something similar already, and will > be able to help me out. > > Here is the text I was sent - but it is really just a guide - it is more a > case of "something" to show as opposed to have any specific item(s). > > I do have a jar that I downloaded from SourceForge - that provides pretty > much what I'm after. > Lines of code / Churn, > Number of commits etc. > > But it is based on the entire repository from revision 0:head. > > The specific request (below) comes from the point of view ; These are > stats are from rev xxx - when we started work on the latest version. > > We don't have a classical "release" branch either - just a forever going > trunk, so we can't use anything "path" specific to obtain the requested > results either. > > Anyway - if you have ideas - I would be most grateful, here is the > questions I was asked; > > Added xxx Lines of new code > Removed xxx Lines of redundant code > Performed more than xxx individual code changes. > > > As always - thanks very much in advance! > > Gavin. It might be a bit overkill for what you're after, but Atlassian Fisheye is really good http://www.atlassian.com/software/fisheye/ It'll give you user statistics for LoC, commits etc. You can also set a starting revision rather than 0. Chris -- Gloucester Research Limited believes the information provided herein is reliable. While every care has been taken to ensure accuracy, the information is furnished to the recipients with no warranty as to the completeness and accuracy of its contents and on condition that any errors or omissions shall not be made the basis for any claim, demand or cause for action. The information in this email is intended only for the named recipient. If you are not the intended recipient please notify us immediately and do not copy, distribute or take action based on this e-mail. All messages sent to and from this email address will be logged by Gloucester Research Ltd and are subject to archival storage, monitoring, review and disclosure. Gloucester Research Limited, 5th Floor, Whittington House, 19-30 Alfred Place, London WC1E 7EA. Gloucester Research Limited is a company registered in England and Wales with company number 04267560. --
Re: Client error when doing server side proplist
Hi again, Just to add: Windows client downloaded from tigris: D:\Projects\X\x>svn --version svn, version 1.6.15 (r1038135) compiled Nov 24 2010, 15:10:19 Copyright (C) 2000-2009 CollabNet. Subversion is open source software, see http://subversion.apache.org/ This product includes software developed by CollabNet (http://www.Collab.Net/). Ubuntu (server): s...@subversion:~$ svn --version svn, version 1.6.6 (r40053) compiled Oct 24 2009, 04:25:06 Copyright (C) 2000-2009 CollabNet. Subversion is open source software, see http://subversion.tigris.org/ This product includes software developed by CollabNet (http://www.Collab.Net/). Regards /Daniel Widenfalk P.s. Sorry for top posting. On 2010-12-10 12:54, Daniel Widenfalk wrote: > Hi all, > > When doing a server side "proplist" I get the following > diagnostic message: > >> svn pl -R http://full-path-to-repo/Proja/trunk/ExecShell.cpp > svn: PROPFIND of '/path-to-repo/!svn/bc/1370/ProjA/trunk/ExecShell.c > pp': 207 Multi-Status (http://name-of-server) > > I only get this for a few files. > > Running 'svnadmin verify' on the repository does not indicate > anything wrong. > > Please advice. > > Regards > /Daniel Widenfalk > > > > -- |\ _,,,---,,_ ZZZzz /,`.-'`'-. ;-;;,_ |,4- ) )-,_. ,\ ( `'-' -'---''(_/--'--`-'\_)- Daniel Widenfalk IAR Systems AB Senior Development EngineerBox 23051 (Islandsgatan 2) S-75023 Uppsala, SWEDEN Phone: +46 (0)18 167800WWW: http://www.iar.se Fax : +46 (0)18 167838EMail: daniel.widenf...@iar.se -- Legal note: "The information contained in this message is confidential and may be legally privileged. It is intended solely for the addressee. Access to this message by anyone else is unauthorized. If you are not the intended recipient, any disclosure, copying or distribution of this message, or any action or omission taken by you in reliance on it, is prohibited and may be unlawful. Please immediately contact the sender if you have received this message in error."
Re: SVN Statistics
You could make a git clone of your Subversion repository. git log --numstat shows the lines added and deleted per commit (revision). Hth, Nick Stolwijk ~Java Developer~ iPROFS Wagenweg 208 2012 NM Haarlem T +31 23 547 6369 F +31 23 547 6370 I www.iprofs.nl On Fri, Dec 10, 2010 at 1:15 PM, Chris Evans wrote: >> -Original Message- >> From: Gavin Beau Baumanis [mailto:b...@palcare.com.au] >> Sent: 10 December 2010 04:46 >> To: Subversion Users >> Subject: SVN Statistics >> >> Hi Everyone, >> >> I have been asked for some statistics about our code base and am hoping >> that someone might have had a task for something similar already, and will >> be able to help me out. >> >> Here is the text I was sent - but it is really just a guide - it is more a >> case of "something" to show as opposed to have any specific item(s). >> >> I do have a jar that I downloaded from SourceForge - that provides pretty >> much what I'm after. >> Lines of code / Churn, >> Number of commits etc. >> >> But it is based on the entire repository from revision 0:head. >> >> The specific request (below) comes from the point of view ; These are >> stats are from rev xxx - when we started work on the latest version. >> >> We don't have a classical "release" branch either - just a forever going >> trunk, so we can't use anything "path" specific to obtain the requested >> results either. >> >> Anyway - if you have ideas - I would be most grateful, here is the >> questions I was asked; >> >> Added xxx Lines of new code >> Removed xxx Lines of redundant code >> Performed more than xxx individual code changes. >> >> >> As always - thanks very much in advance! >> >> Gavin. > > It might be a bit overkill for what you're after, but Atlassian Fisheye is > really good http://www.atlassian.com/software/fisheye/ > It'll give you user statistics for LoC, commits etc. You can also set a > starting revision rather than 0. > > Chris > > -- > Gloucester Research Limited believes the information provided herein is > reliable. While every care has been taken to ensure accuracy, the information > is furnished to the recipients with no warranty as to the completeness and > accuracy of its contents and on condition that any errors or omissions shall > not be made the basis for any claim, demand or cause for action. > The information in this email is intended only for the named recipient. If > you are not the intended recipient please notify us immediately and do not > copy, distribute or take action based on this e-mail. > All messages sent to and from this email address will be logged by Gloucester > Research Ltd and are subject to archival storage, monitoring, review and > disclosure. > Gloucester Research Limited, 5th Floor, Whittington House, 19-30 Alfred > Place, London WC1E 7EA. > Gloucester Research Limited is a company registered in England and Wales with > company number 04267560. > -- >
Re: SVN Statistics
On another note, I see you have a jar from SF which does almost what you want. Why not checkout their code and let it do exactly what you want? I guess somewhere in there is a starting revision, which you can change. If you don't know Java, send me the projectname and I can have a look. Hth, Nick Stolwijk ~Java Developer~ iPROFS Wagenweg 208 2012 NM Haarlem T +31 23 547 6369 F +31 23 547 6370 I www.iprofs.nl On Fri, Dec 10, 2010 at 5:46 AM, Gavin Beau Baumanis wrote: > Hi Everyone, > > I have been asked for some statistics about our code base and am hoping that > someone might have had a task for something similar already, and will be able > to help me out. > > Here is the text I was sent - but it is really just a guide - it is more a > case of "something" to show as opposed to have any specific item(s). > > I do have a jar that I downloaded from SourceForge - that provides pretty > much what I'm after. > Lines of code / Churn, > Number of commits etc. > > But it is based on the entire repository from revision 0:head. > > The specific request (below) comes from the point of view ; > These are stats are from rev xxx - when we started work on the latest version. > > We don't have a classical "release" branch either - just a forever going > trunk, so we can't use anything "path" specific to obtain the requested > results either. > > Anyway - if you have ideas - I would be most grateful, here is the questions > I was asked; > > Added xxx Lines of new code > Removed xxx Lines of redundant code > Performed more than xxx individual code changes. > > > As always - thanks very much in advance! > > Gavin.
Re: Strange meta-data problem when checking out
The server and client are running version 1.6.6. The server is running CentOS, client is Mac with the commandline client. The command was as expected: svn checkout https://my_url On Dec 10, 2010, at 12:34 PM, Giulio Troccoli 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: 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: Strange meta-data problem when checking out
On 12/10/10 7:33 AM, Jochen Wuttke wrote: The server and client are running version 1.6.6. The server is running CentOS, client is Mac with the commandline client. The command was as expected: svn checkout https://my_url If it is something on the CentOS side, strange permission issues can be caused by having SELinux in enforcing mode. This adds an extra layer of security based on the process, not the id/gid that can be hard to diagnose. -- Les Mikesell lesmikes...@gmail.com
Re: Strange meta-data problem when checking out
Some serious digging and delving identified the problem: A user did the following command sequence: svn add Prospectus.tex svn ci mv Prospectus.tex prospectus.tex svn add prospectus.tex svn ci Now, because by default HFS does not distinguish between the two filenames, but svn does, it tried to check out the same file twice, and write different meta-data files, which apparently it couldn't. This breaks the working copy where you attempt a checkout or update. svn cleanup will not fix this! The solution is that the criminal who actually did the incorrect rename does a 'svn delete' on one of the two filenames and commits that change. After that svn cleanup svn update fixes affected working copies. You may need to delete the meta-data, but at least you get back a working copy. Jochen On Dec 10, 2010, at 2:33 PM, Wuttke Jochen David wrote: The server and client are running version 1.6.6. The server is running CentOS, client is Mac with the commandline client. The command was as expected: svn checkout https://my_url On Dec 10, 2010, at 12:34 PM, Giulio Troccoli 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: 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?
svn:externals not merged across branches
Hi all, Today I encountered the problem that svn:externals are not merged across branches. That is to say, I had done development on a branch, introduced a couple of svn:externals on that branch and when everything was to my liking I merged the development branch with the trunk. To my surprise, the svn:externals I had defined on the branch were not merged with the trunk. Is this expected behavior or not? Best regards, Marcel Loose.
Re: Periodically merge between trunk->branch and branch->trunk
On Fri, Dec 10, 2010 at 01:09:45PM +0100, B Smith-Mannschott wrote: > On Thu, Dec 9, 2010 at 20:27, Kris Deugau wrote: > > Daniel Albuschat wrote: > >> > >> I'd like to create a branch from trunk and periodically merge trunk > >> into my branch to stay up to date with what happens in trunk. > >> At some point, the feature in my branch reaches a kind of stability > >> that is OK for trunk, so I merge it back to trunk. > >> The difference to the standard situation is that I want to continue > >> working on the branch, because the feature is not completely finished, > >> yet, or it needs further enhancement. > >> Currently the only solution I see is to reintegrate the branch to > >> trunk and then re-create the branch. This has the shortcoming that all > >> developers working on the branch have to switch to the new branch > >> (although it is the same URL) to be able to work with it, right? This > >> is ok when I'm working alone on my branch, but with a development > >> team, it becomes tricky to make sure that everyone properly switch to > >> the new branch. > > > > This is covered in the book: > > > > http://svnbook.red-bean.com/nightly/en/svn.branchmerge.advanced.html#svn.branchmerge.advanced.reintegratetwice > > Before going down that route, be sure to have understood the > implications of issue 3650: > http://subversion.tigris.org/issues/show_bug.cgi?id=3650 > > short summary: this technique renders `svn log --use-merge-history` useless. It's worth pointing out that this is a bug in log --use-merge-history, not in the technique. Stefan
Re: SVN Statistics
Check out StatSVN: http://www.statsvn.org/ Cheers. On Thu, Dec 9, 2010 at 20:46, Gavin Beau Baumanis wrote: > Hi Everyone, > > I have been asked for some statistics about our code base and am hoping > that someone might have had a task for something similar already, and will > be able to help me out. > > Here is the text I was sent - but it is really just a guide - it is more a > case of "something" to show as opposed to have any specific item(s). > > I do have a jar that I downloaded from SourceForge - that provides pretty > much what I'm after. > Lines of code / Churn, > Number of commits etc. > > But it is based on the entire repository from revision 0:head. > > The specific request (below) comes from the point of view ; > These are stats are from rev xxx - when we started work on the latest > version. > > We don't have a classical "release" branch either - just a forever going > trunk, so we can't use anything "path" specific to obtain the requested > results either. > > Anyway - if you have ideas - I would be most grateful, here is the > questions I was asked; > > Added xxx Lines of new code > Removed xxx Lines of redundant code > Performed more than xxx individual code changes. > > > As always - thanks very much in advance! > > Gavin.
