Re: Error with file externals
Hello, So maybe it is related to the server version and the communication protocol. I have made Wireshark captures for the failed and for the successful communication. If anyone is interested in those captures please say so, I didn't want to send them directly to the list. Anyway, if the bug cannot be found I could always use directory externals instead of file externals, they work just fine. And that's what I did yesterday to work around this problem. Best regards Stefan
Re: Error with file externals
Hi, just wanted to say thanks for the effective bug report. I'm not able to look further into this right now but I hope someone else will. Daniel Stefan Podskubka wrote on Wed, May 09, 2012 at 09:20:59 +0200: > Hello, > >> So maybe it is related to the server version and the communication >> protocol. > I have made Wireshark captures for the failed and for the successful > communication. > If anyone is interested in those captures please say so, I didn't want > to send them directly to the list. > >> Anyway, if the bug cannot be found I could always use directory >> externals instead of file externals, they work just fine. > And that's what I did yesterday to work around this problem. > > Best regards > Stefan
RE: SVN+LDAP+APache Access issue.
> -Original Message- > From: sdevinen [mailto:sriharsha.w...@gmail.com] > Sent: 08 May 2012 19:50 > To: users@subversion.apache.org > Subject: SVN+LDAP+APache Access issue. > > > Hi All, > > I am new to SVN Administration. I am trying to setup access > restriction per > repository. > for cm_qa repo, i need svn-eng-rw group to have read/write access, > svn-eng-readonly to have readonly access, and no access to > anyone outside > these 2 groups. > > Can you please help me with this issue > > DAV svn > SVNParentPath /mnt/data/svn > SVNListParentPath on > SSLRequireSSL > AuthzLDAPAuthoritative off > AuthName "Protected area" > AuthType Basic > AuthBasicProvider ldap > AuthLDAPUrl "ldap://ldap.x.com/ou=People,DC=x,DC=com"; > Require valid-user > > > > > require ldap-group cn=svn-x,ou=Group,dc=x,dc=com > require ldap-group cn=svn-kiev,ou=Group,dc=x,dc=com > # Require ldap-group cn=svn-eng-readonly,ou=Group,dc=x,dc=com > # Require ldap-group cn=svn-eng-rw,ou=Group,dc=x,dc=com > > > > > DAV svn > SVNParentPath /mnt/data/svn > SVNListParentPath on > SSLRequireSSL > AuthzLDAPAuthoritative off > AuthName "Protected area" > AuthType Basic > AuthBasicProvider ldap > AuthLDAPUrl "ldap://ldap.x.com/ou=People,DC=x,DC=com"; > > require ldap-group cn=svn-eng-readonly,ou=Group,dc=x,dc=com > > require ldap-group cn=svn-eng-rw,ou=Group,dc=x,dc=com > > > Thanks in Advance > Tillu. As far as I know you cannot do this using vanilla apache. Answers to similar questions (did you search the list before posting?) generally recommend using a script to poll LDAP and update your repository's path based authorisation file with the group members... ~ mark c > -- > View this message in context: > http://old.nabble.com/SVN%2BLDAP%2BAPache-Access-issue.-tp33763590p33763590.html > Sent from the Subversion Users mailing list archive at Nabble.com. > >
Re: SVN+LDAP+APache Access issue.
On Tue, May 8, 2012 at 8:49 PM, sdevinen wrote: > > > Hi All, > > I am new to SVN Administration. I am trying to setup access restriction > per > repository. > for cm_qa repo, i need svn-eng-rw group to have read/write access, > svn-eng-readonly to have readonly access, and no access to anyone outside > these 2 groups. > > Can you please help me with this issue ... > > DAV svn > SVNParentPath /mnt/data/svn > SVNListParentPath on > SSLRequireSSL > AuthzLDAPAuthoritative off > AuthName "Protected area" > AuthType Basic > AuthBasicProvider ldap > AuthLDAPUrl "ldap://ldap.x.com/ou=People,DC=x,DC=com"; > > require ldap-group cn=svn-eng-readonly,ou=Group,dc=x,dc=com > > require ldap-group cn=svn-eng-rw,ou=Group,dc=x,dc=com > > Could this fix that it? Create 2 locations: /export/svn/cm_qa_rw and /export/svn/cm_qa_ro referring to the same SVNParentPath but with different permissions. -- DISCLAIMER http://www.tvh.com/newen2/emaildisclaimer/default.html "This message is delivered to all addressees subject to the conditions set forth in the attached disclaimer, which is an integral part of this message."
Re: Error with file externals
On Wed, May 09, 2012 at 11:09:35AM +0300, Daniel Shahaf wrote: > Hi, just wanted to say thanks for the effective bug report. Yes, it is very good indeed. > I'm not able to look further into this right now but I hope someone else will. Stefan, could you please file an issue for this? Someone will take a look at this eventually. Thanks.
Re: Error with file externals
Stefan Sperling wrote on Wed, May 09, 2012 at 11:12:10 +0200: > On Wed, May 09, 2012 at 11:09:35AM +0300, Daniel Shahaf wrote: > > Hi, just wanted to say thanks for the effective bug report. > > Yes, it is very good indeed. > > > I'm not able to look further into this right now but I hope someone else > > will. > > Stefan, could you please file an issue for this? Someone will take > a look at this eventually. Thanks. Maybe next month at the hackathon?
AW: svn cleanup fails to clean up
> -Ursprüngliche Nachricht- > Von: Konstantin Kolinko [mailto:knst.koli...@gmail.com] > > I had an IOerror when updating an external > > (different story of an incompatibility between sqlite and our > > corporate virus scanner, which is already being worked on > > by our Virus department). > > > > Now svn cleanup fails: > > > > D:\PRJ\STM\REF\svn_nbgvo\stp\GSBTG\in\wom>svn cleanup > > svn: E155016: Missing a row in WCROOT for > > 'D:\PRJ\STM\REF\svn_nbgvo\stp\GSBTG\in\wom'. ^^ this seems to tell me the root of the damaged working copy. > > svn: E155016: Missing a row in WCROOT. > > > > (This is Tortoise SVN's command line client > > svn, version 1.7.4 (r1295709) > > compiled Mar 8 2012, 18:47:27 > > on windows XP, the root of the WC is D:\PRJ\STM\REF\svn_nbgvo\stp > > ) > > > > If I cd .. and svn cleanup there, I don't get an error, but > when I svn > > update again, > > it still doesn't work: > > > > D:\PRJ\STM\REF\svn_nbgvo\stp\GSBTG\in\wom>cd .. > > > > D:\PRJ\STM\REF\svn_nbgvo\stp\GSBTG\in>svn cleanup> [...] > If cleanup cannot fix the problem, the only way would be to delete the > "wom" directory (the broken nested worked copy) and let svn up in its > parent directory to retrieve a fresh copy of it. > Thank you Kontantin, this was the clue I needed: it was enough to delete the wom directory and svn update its parent to restore (only) the external from the repository. I did not have to refetch the complete working copy. And now I see that svn cleanup *has* told me, which database was corrupt. To me it was not obvious which svn cleanup invocation deals with which .svn directory. Mit freundlichen Grüßen Dr. Hartmut Niemann Siemens AG Infrastructure & Cities Sector Rail Systems Division Locomotives and Components IC RL LOC EN LE 8 Werner-von-Siemens-Str. 67 91052 Erlangen, Deutschland Tel.: +49 9131 7-34264 Fax: +49 9131 7-26254 mailto:hartmut.niem...@siemens.com Siemens Aktiengesellschaft: Vorsitzender des Aufsichtsrats: Gerhard Cromme; Vorstand: Peter Löscher, Vorsitzender; Roland Busch, Brigitte Ederer, Klaus Helmrich, Joe Kaeser, Barbara Kux, Hermann Requardt, Siegfried Russwurm, Peter Y. Solmssen, Michael Süß; Sitz der Gesellschaft: Berlin und München, Deutschland; Registergericht: Berlin Charlottenburg, HRB 12300, München, HRB 6684; WEEE-Reg.-Nr. DE 23691322
Re: Merge information in ls OR "svn ls -v -g"
There's no interest/descending/rebuttal opinion to this? Should I create a enhancement ticket? I thought that this was the medium to first propose changes/enhancements for discussion. On Mon, Apr 30, 2012 at 4:16 PM, James Hanley wrote: > All, > > I'm raising the issue that there should be an option to include merge > information of an "ls -v" in much the same way that "svn blame" > supports it. Although, I can easily use "svn blame -g" to find out who > /originally/ added a file, it's not intuitive, the more natural method > (IMHO) is to use "svn ls -v -g" to give the info on who originally > added/modified a file, not necessarily the last to merge the new file. > > Essentially, I'm looking for merge history blame on a path structure > in the same way that I can get merge history blame on an individual > file contents. > > -Jim
Re: Merge information in ls OR "svn ls -v -g"
On Wed, May 9, 2012 at 9:08 AM, James Hanley wrote: > There's no interest/descending/rebuttal opinion to this? Should I > create a enhancement ticket? I thought that this was the medium to > first propose changes/enhancements for discussion. My 2 cents would be that I do not see the need or value. The ls command is only showing a single version of each path, I do not see how you could show merge info. If you want to see the history of a path, then use the svn log -g command. > I'm raising the issue that there should be an option to include merge > information of an "ls -v" in much the same way that "svn blame" > supports it. Although, I can easily use "svn blame -g" to find out who > /originally/ added a file, it's not intuitive, the more natural method > (IMHO) is to use "svn ls -v -g" to give the info on who originally > added/modified a file, not necessarily the last to merge the new file. What if the most recent change to the file was a regular commit, but the previous change was the merge? What if the last change was the commit of a merge but there were 4 different revisions by 4 different authors. I do not see how ls is supposed to represent that. > Essentially, I'm looking for merge history blame on a path structure > in the same way that I can get merge history blame on an individual > file contents. The command to inspect the history of a path is svn log, not svn ls. Add the -g option to log if you want to include merge information. -- Thanks Mark Phippard http://markphip.blogspot.com/
Checking for merge updates with "svn status -u -g"
When creating a branch, it would be very useful if merge data could optionally be included in svn status -u with the -g option. Essentially, it would tell you if there are changes upstream from the origination of the branch... I'm not entirely certain what the output should look like, but it might indicate a table key of ancestry at the top and a similar output to "svn status -u" with indication of where the ancestry has the update yet to be merged: [a1 = /trunk] [a2 = /branches/team_branch_base] [a3 = /branches/userbob_feature_widget] * 517 ./hello.c [a1]* 507 ./world.c * 517 ./foo.h *./bar.h [WC] M569 ./dir [WC] M569 ./dir/file.c Thoughts?
Re: Checking for merge updates with "svn status -u -g"
On Wed, May 09, 2012 at 09:32:05AM -0400, James Hanley wrote: > When creating a branch, it would be very useful if merge data could > optionally be included in svn status -u with the -g option. > Essentially, it would tell you if there are changes upstream from the > origination of the branch... I'm not entirely certain what the output > should look like, but it might indicate a table key of ancestry at the > top and a similar output to "svn status -u" with indication of where > the ancestry has the update yet to be merged: > > [a1 = /trunk] > [a2 = /branches/team_branch_base] > [a3 = /branches/userbob_feature_widget] > * 517 ./hello.c > [a1]* 507 ./world.c > * 517 ./foo.h > *./bar.h > [WC] M569 ./dir > [WC] M569 ./dir/file.c > > Thoughts? This command lists files that differ between branches, which may be a close match to what you're asking for: svn diff --summarize BRANCH1_URL BRANCH2_URL You'd have to run it separately for each branch you're interested in.
Re: Checking for merge updates with "svn status -u -g"
On Wed, May 9, 2012 at 9:40 AM, Stefan Sperling wrote: > On Wed, May 09, 2012 at 09:32:05AM -0400, James Hanley wrote: >> When creating a branch, it would be very useful if merge data could >> optionally be included in svn status -u with the -g option. >> Essentially, it would tell you if there are changes upstream from the >> origination of the branch... I'm not entirely certain what the output >> should look like, but it might indicate a table key of ancestry at the >> top and a similar output to "svn status -u" with indication of where >> the ancestry has the update yet to be merged: >> >> [a1 = /trunk] >> [a2 = /branches/team_branch_base] >> [a3 = /branches/userbob_feature_widget] >> * 517 ./hello.c >> [a1] * 507 ./world.c >> * 517 ./foo.h >> * ./bar.h >> [WC] M 569 ./dir >> [WC] M 569 ./dir/file.c >> >> Thoughts? > > This command lists files that differ between branches, which may > be a close match to what you're asking for: > > svn diff --summarize BRANCH1_URL BRANCH2_URL > > You'd have to run it separately for each branch you're interested in. I would probably go with: $ svn mergeinfo --show-revs=eligible ^/source-branch Some GUI tools, at least Subclipse, will show this info in log-style format. -- Thanks Mark Phippard http://markphip.blogspot.com/
