RE: svn mergeinfo and svn merge - questions

[Tati, Aslesh : Barclaycard US]

1. You can use svn merge --dry-run if you are using command line or if you 
are using a client like tortoise then a test merge option should be available. 
This won't actually merge but show if there will be any failure in case an 
actual merge was performed.


2. Do the re-intergrate merges on your local copies and once it is complete 
(re-intergrate merge shouldn't most likely fail during the actual operation 
itself) you can resolve the conflicts during the commit to your subversion 
repositories (SVN Red Bean book for resolving conflicts explains things in 
detail)



3. Not sure about this



From: Z W [mailto:mpc8...@gmail.com]
Sent: Thursday, October 17, 2013 3:37 PM
To: users@subversion.apache.org
Subject: svn mergeinfo and svn merge - questions

Hi All

We are using 1.6 SVN.
We like to svn merge from our branch A to trunk.
We have been diligent in svn merge from trunk to A.
These svn merges from trunk to branch A also include --record-only merges too, 
in addition to regular merges.
Development on branch A has stopped.
Now we like to merge branch A to trunk using --reintegrate option.
But we dont know what to expect if using this option fails on us.

1) Suppose svn merge --reintegrate fails on us on a working copy that has all 
the mergeinfo list information.
Could we perform a clean co of branch A into another working copy and then 
perform svn merge --reintegrate to trunk there ?
Will we get more conflicts simply because the new working copy doesnt have the 
mergeinfo list like the first working copy of branch A ?
Will this plan B work ?

2) How do we resolve conflicts during svn merge --reintegrate process ?
Would you share the steps for us to make the merge go smoothly ?

3) Is mergeinfo a global or local property ? it seems that whenever a new 
checkout is done, mergeinfo list matches up with other working copies of the 
same branch.


Any help is appreciated.
Sincerely


Barclaycard
www.barclaycardus.com 

This email and any files transmitted with it may contain confidential and/or 
proprietary information. It is intended solely for the use of the individual or 
entity who is the intended recipient. Unauthorized use of this information is 
prohibited. If you have received this in error, please contact the sender by 
replying to this message and delete this material from any system it may be on.

Path based authorization using LDAP groups

[Tati, Aslesh : Barclaycard US]

I'm trying to setup a path based authorization using different LDAP groups.

Developers should be able to see all repositories and commit to all repos (the 
corresponding LDAP group is subversion_developers)

Business users should be able to see all repositories but only commit to 
specific assigned repo (corresponding LDAP group is subversion_bususers)

There is another LDAP group which is subversion_readonly which is intended to 
give read only access to all repos.

My httpd.conf looks something like this:

RedirectMatch ^(/svn)$ $1/
Location /repos
   DAV svn
   SVNParentPath /local/data/svn/svntestrepos
   SVNReposName CollabNet Subversion Repository
   BrowserMatch  ^SVN/1.[456] denyclient
   order allow,deny
   allow from all
   deny from env=denyclient
   SVNListParentPath On
   Allow from all
   AuthType Basic
   AuthName CollabNet Subversion Repository
   AuthBasicProvider  ldap
  AuthLDAPUrl 
ldap://xyz.com:3268/dc=abc,dc=com?sAMAccountName?sub?objectClass=*; NONE
   AuthLDAPBindDN svn_user
   AuthLDAPBindPassword password
  LimitExcept OPTIONS GET PROPFIND REPORT
   require ldap-group CN= subversion_readonly,OU=abc Access Groups,DC=abc,DC=com
  /LimitExcept
   require ldap-group CN= subversion_developers,OU=abc Access 
Groups,DC=abc,DC=com
/Location

Location /repos/business
   DAV svn
   SVNPath /local/data/svn/svntestrepos/business
   SVNReposName CollabNet Business users Subversion Repository
   BrowserMatch  ^SVN/1.[456] denyclient
   order allow,deny
   allow from all
   deny from env=denyclient
   Allow from all
   AuthType Basic
   AuthName CollabNet Business Users Subversion Repository
   AuthBasicProvider  ldap
   AuthLDAPUrl 
ldap://xyz.com:3268/dc=abc,dc=com?sAMAccountName?sub?objectClass=*; NONE
   AuthLDAPBindDN svn_user
   AuthLDAPBindPassword password
  LimitExcept OPTIONS GET PROPFIND REPORT
   require ldap-group CN= subversion_readonly,OU=abc Access Groups,DC=abc,DC=com
  /LimitExcept
   require ldap-group CN= subversion_bususers,OU=abc Access Groups,DC=abc,DC=com
/Location

I'm able to access all repos except the business repo with this setting and 
when I try to commit something I get an error saying Redirect cycle detected 
for URL

Does this have something to do with the line RedirectMatch ^(/svn)$ $1/ ? I'm 
pretty much a novice at apache configuration, so forgive my ignorance.

Any help is appreciated, Thank you.



Barclaycard
www.barclaycardus.com 

This email and any files transmitted with it may contain confidential and/or 
proprietary information. It is intended solely for the use of the individual or 
entity who is the intended recipient. Unauthorized use of this information is 
prohibited. If you have received this in error, please contact the sender by 
replying to this message and delete this material from any system it may be on.