Bug report: svn assert failure: svn: subversion/libsvn_client/merge.c:3128: merge_dir_deleted: Assertion `delb != ((void *)0)' failed.

2014-03-14 Thread Danilo Piazzalunga
Hi all,
I am asking for confirmation before reporting a bug

Using Subversion 1.8.8 installed from Ubuntu 14.04 packages, svn
crashed while performing a merge operation involving a replaced
directory.

I already reportted this bug to Ubuntu Launchpad as
https://bugs.launchpad.net/ubuntu/+source/subversion/+bug/1288829

I was able to reproduce the bug with Subversion 1.9.0-dev trunk
(r1577730) with a self-contained test case (see attachment).

Can I report this to the Issue Tracker?

Regards,
Danilo Piazzalunga


repro-lp1288829.sh
Description: Bourne shell script


A question about committing a deleted file

2014-03-14 Thread Zi Wang
Hello, please help me to understand this:

Here is the scenario:


Two person A and B are working on the same project and both have a working
copy on their machine,
A: Lock(check out) a file, call it FILE_X
B: Break FILE_X's lock, then Delete FILE_X and Commit
A: Update (now FILE_X is gone on A's working copy), then Add a new file
also called FILE_X, then Commit

Now, at this point, FILE_X on A's working copy will have a Lock, even
though it was a new file just with the same name, how come? Does SVN
remembers the status? If so, is there a way to tell SVN to 'forgot' the
status?

Thank you!


Re: svnhook question

2014-03-14 Thread Andreas Stieger
Hello,

On 14/03/14 17:15, Havlovick, Ron wrote:
> When the last person commits their files into svn,  post svnhook I
> believe, an asci file will be created or written to, which contains the
> revision number of that last svn commit.

Contrary to what Henrik wrote.. just ad a post-commit hook with
something like this:

GNU/Linux:

#!/bin/sh
REPOS="$1"
REV="$2"
echo "$REV" > /path/to/file.txt

Windows:

SET REPOS-PATH=%1
SET REV=%2
echo %REV% > C:\Path\to\file.txt

With kind regards,
Andreas Stieger


Re: svn log entries with no data

2014-03-14 Thread Eric Johnson
Finally triggered a memory over here - almost certainly a svndumpfilter 
operation that filtered out commit contents.


Eric.

On 3/14/14, 2:25 PM, Eric Johnson wrote:

More puzzling then either case you suggest.

Doing "svn log -v --xml ..." directly on the server (thus 
side-stepping authorization questions) yields:







































It's like the only thing left of these revisions is just the revision 
#. Even svnlook on the server yields blank responses.


$ svnlook info ___ --revision 2


0
$ svnlook info ___ --revision 3


0

Anyone seen anything like this before?

Eric.

On 3/14/14, 12:18 PM, Philip Martin wrote:

Stefan Sperling  writes:


On Fri, Mar 14, 2014 at 10:51:56AM -0700, Eric Johnson wrote:

Just encountered a weird issue

I'm seeing Subversion log entries with no data. For example, svn 
log output

that looks like the following:

 


r2 | (no author) | (no date) | 1 line


 


r3 | (no author) | (no date) | 1 line


 


r4 | (no author) | (no date) | 1 line



How is this possible? Have I lost data?

svnadmin verify doesn't report any problems.

Eric.

Perhaps the authz configuration denies your user access to one
or more paths which were modified in these revisions. In this
case the log message and changed paths list are never shown since
doing so might reveal the existence of secret files.

If authz denies access to some, but not all, of the paths modified in a
revision then log shows svn:author and svn:date but does not show
svn:log.  That is not what is shown above.

If authz denied access to all of the paths modified in a revision then
log does not show any of svn:author, svn:date or svn:log.  That could be
what is shown above.  Given read access to the root and no access to a
subdir then revisions that only modify paths in the subdir produce that
output.

The other possibility is that svn:date and svn:author have been deleted
from the revisions.







Re: svn log entries with no data

2014-03-14 Thread Eric Johnson

More puzzling then either case you suggest.

Doing "svn log -v --xml ..." directly on the server (thus side-stepping 
authorization questions) yields:







































It's like the only thing left of these revisions is just the revision #. 
Even svnlook on the server yields blank responses.


$ svnlook info ___ --revision 2


0
$ svnlook info ___ --revision 3


0

Anyone seen anything like this before?

Eric.

On 3/14/14, 12:18 PM, Philip Martin wrote:

Stefan Sperling  writes:


On Fri, Mar 14, 2014 at 10:51:56AM -0700, Eric Johnson wrote:

Just encountered a weird issue

I'm seeing Subversion log entries with no data. For example, svn log output
that looks like the following:


r2 | (no author) | (no date) | 1 line



r3 | (no author) | (no date) | 1 line



r4 | (no author) | (no date) | 1 line



How is this possible? Have I lost data?

svnadmin verify doesn't report any problems.

Eric.

Perhaps the authz configuration denies your user access to one
or more paths which were modified in these revisions. In this
case the log message and changed paths list are never shown since
doing so might reveal the existence of secret files.

If authz denies access to some, but not all, of the paths modified in a
revision then log shows svn:author and svn:date but does not show
svn:log.  That is not what is shown above.

If authz denied access to all of the paths modified in a revision then
log does not show any of svn:author, svn:date or svn:log.  That could be
what is shown above.  Given read access to the root and no access to a
subdir then revisions that only modify paths in the subdir produce that
output.

The other possibility is that svn:date and svn:author have been deleted
from the revisions.





Re: svnhook question

2014-03-14 Thread Henrik Carlqvist
On Fri, 14 Mar 2014 17:15:15 +
"Havlovick, Ron"  wrote:
> This is for a fpga and I want the svn revision number to be within the
> FPGA. When the revision register is read, it agrees with the svn
> revision number.
> 
> Not how to do it. Is it possible?

It seems to me as if you are looking for the $GlobalRev$ keyword mentioned
at this page:
http://svnbook.red-bean.com/en/1.4/svn.advanced.props.special.keywords.html

But unfortunately that keyword does not exist. You will probably need some
kind of script that calls svnversion. You could use that script to alter
some file before commit or you could use the script to put the output from
svnversion into the binary when compiling your software.

regards Henrik


Re: svn log entries with no data

2014-03-14 Thread Philip Martin
Stefan Sperling  writes:

> On Fri, Mar 14, 2014 at 10:51:56AM -0700, Eric Johnson wrote:
>> Just encountered a weird issue
>> 
>> I'm seeing Subversion log entries with no data. For example, svn log output
>> that looks like the following:
>> 
>> 
>> r2 | (no author) | (no date) | 1 line
>> 
>> 
>> 
>> r3 | (no author) | (no date) | 1 line
>> 
>> 
>> 
>> r4 | (no author) | (no date) | 1 line
>> 
>> 
>> 
>> How is this possible? Have I lost data?
>> 
>> svnadmin verify doesn't report any problems.
>> 
>> Eric.
>
> Perhaps the authz configuration denies your user access to one
> or more paths which were modified in these revisions. In this
> case the log message and changed paths list are never shown since
> doing so might reveal the existence of secret files.

If authz denies access to some, but not all, of the paths modified in a
revision then log shows svn:author and svn:date but does not show
svn:log.  That is not what is shown above.

If authz denied access to all of the paths modified in a revision then
log does not show any of svn:author, svn:date or svn:log.  That could be
what is shown above.  Given read access to the root and no access to a
subdir then revisions that only modify paths in the subdir produce that
output.

The other possibility is that svn:date and svn:author have been deleted
from the revisions.

-- 
Philip Martin | Subversion Committer
WANdisco // *Non-Stop Data*


Re: svn log entries with no data

2014-03-14 Thread Stefan Sperling
On Fri, Mar 14, 2014 at 10:51:56AM -0700, Eric Johnson wrote:
> Just encountered a weird issue
> 
> I'm seeing Subversion log entries with no data. For example, svn log output
> that looks like the following:
> 
> 
> r2 | (no author) | (no date) | 1 line
> 
> 
> 
> r3 | (no author) | (no date) | 1 line
> 
> 
> 
> r4 | (no author) | (no date) | 1 line
> 
> 
> 
> How is this possible? Have I lost data?
> 
> svnadmin verify doesn't report any problems.
> 
> Eric.

Perhaps the authz configuration denies your user access to one
or more paths which were modified in these revisions. In this
case the log message and changed paths list are never shown since
doing so might reveal the existence of secret files.


Re: Question regarding mod_authnz_svn configurations

2014-03-14 Thread Stefan Sperling
On Fri, Mar 14, 2014 at 10:12:07AM -0500, Matthew Hamilton wrote:
> I have read the Subversion book regarding the configuration of
> mod_authnz_svn and mod_dav_svn for apache as the Subversion server.

It's called 'mod_authz_svn'.

> I am making use of mod_authnz_ldap to restrict access to our repositories
> based on ldap-group membership and we are using Active Directory as our
> LDAP server.
> 
> I want to also be able to set up path-based authorization and have the
> access based on the users ldap-group membership.

> Are there any plans to introduce this kind of functionality to
> mod_authnz_svn?

There is a patch which needs more work. See the thread which
starts here: http://svn.haxx.se/dev/archive-2013-07/0173.shtml
and ends here: http://svn.haxx.se/dev/archive-2013-07/0327.shtml


svn log entries with no data

2014-03-14 Thread Eric Johnson

Just encountered a weird issue

I'm seeing Subversion log entries with no data. For example, svn log 
output that looks like the following:



r2 | (no author) | (no date) | 1 line



r3 | (no author) | (no date) | 1 line



r4 | (no author) | (no date) | 1 line



How is this possible? Have I lost data?

svnadmin verify doesn't report any problems.

Eric.



svnhook question

2014-03-14 Thread Havlovick, Ron
I hope I am not posting this to the group incorrectly.
I got thrown into this by my boss and so now I am just beginning to do some 
homework.

Not asking how to do it, just if ya'll think it can be done.

When the last person commits their files into svn,  post svnhook I believe, an 
asci file will be created or written to, which contains the revision number of 
that last svn commit.
This is for a fpga and I want the svn revision number to be within the FPGA. 
When the revision register is read, it agrees with the svn revision number.

Not how to do it. Is it possible?

Thanks

Ron g. Havlovick



___
This e-mail and any files transmitted with it are proprietary and intended 
solely for the use of the individual or entity to whom they are addressed. If 
you have reason to believe that you have received this e-mail in error, please 
notify the sender and destroy this email and any attached files. Please note 
that any views or opinions presented in this e-mail are solely those of the 
author and do not necessarily represent those of the Curtiss-Wright Corporation 
or any of its subsidiaries.  Documents attached hereto may contain technology 
subject to government export regulations. Recipient is solely responsible for 
ensuring that any re-export, transfer or disclosure of this information is in 
accordance with applicable government export regulations.  The recipient should 
check this e-mail and any attachments for the presence of viruses. 
Curtiss-Wright Corporation and its subsidiaries accept no liability for any 
damage caused by any virus transmitted by this e-mail.

Re: Question regarding mod_authnz_svn configurations

2014-03-14 Thread Matthew Hamilton
Below is my apache config for SVN:

httpd.conf:
   
  # mod_dav_svn configuration
  DAV svn
  SVNParentPath /opt/web/subversion/repos

  # mod_authn_core configuration
  AuthType Basic
  AuthName "Authorized Developers Only"

  # mod_auth_basic
  AuthBasicProvider ldap

  # mod_authnz_ldap configuration
  # LDAP Authentication & Authorization is final; do not check other
databases
  AuthLDAPBindAuthoritative on
  AuthLDAPBindDN CN=LDAPBINDSVN,OU=LDAP,DC=mycorp,DC=com
  AuthLDAPBindPassword [redacted]
  # The LDAP query URL
  AuthLDAPURL "ldap://
ldap.mycorp.com:3268/DC=mycorp,DC=com?sAMAccountName?sub?(objectClass=*)"

  # mod_authnz_svn configuration
  AuthzSVNAccessFile /opt/web/httpd/conf/extra/svn-access.conf

  Require valid-user
   

   # Access control to individual SVN repositories based on URL path.
   
  Require ldap-group CN=SVN_POC_DEVS,OU=LDAP,DC=mycorp,DC=com
  Require ldap-group CN=SVN_POC_MGRS,OU=LDAP,DC=mycorp,DC=com
   

   # Access control to individual SVN repositories based on URL path.
   
  Require ldap-group CN=SVN_POC_DEVS,OU=LDAP,DC=mycorp,DC=com
  Require ldap-group CN=SVN_POC_MGRS,OU=LDAP,DC=mycorp,DC=com
   

   # Access control to individual SVN repositories based on URL path.
   
  Require ldap-group CN=SVN_POC_DEVS,OU=LDAP,DC=mycorp,DC=com
  Require ldap-group CN=SVN_POC_MGRS,OU=LDAP,DC=mycorp,DC=com
   

-

svn-access.conf
[aliases]
poc_devs = CN=SVN_POC_DEVS,OU=LDAP,DC=mycorp,DC=com
poc_mgrs = CN=SVN_POC_MGRS,OU=LDAP,DC=mycorp,DC=com

[groups]
poc_dev = &poc_devs
poc_mgr = &poc_mgrs

[webadmin:/]
poc_dev = rw
poc_mgr = r

[jenkinsAdmin:/]
poc_mgr = rw
poc_dev = r

[middlewareAutomation:/]
poc_dev = rw
poc_mgr = r

---

My ID "mhamilton" is part of the group SVN_POC_DEVS and as part of the test
I am requiring that the repository access requires the user to at least be
part of one of the two groups.  In the above configuration I get the
following error message in the apache error log file:

[Fri Mar 14 10:43:10.754361 2014] [authz_svn:error] [pid 4993:tid
139652358960896] [client 172.21.48.120:59293] Access denied: 'mhamilton'
GET webadmin:/
[Fri Mar 14 10:43:12.549245 2014] [authz_svn:error] [pid 4993:tid
139652379940608] [client 172.21.48.120:59293] Access denied: 'mhamilton'
GET webadmin:/
[Fri Mar 14 10:43:19.994583 2014] [authz_svn:error] [pid 4993:tid
139652369450752] [client 172.21.48.120:59293] Access denied: 'mhamilton'
GET jenkinsAdmin:/
[Fri Mar 14 10:43:27.922455 2014] [authz_svn:error] [pid 4993:tid
139652270913280] [client 172.21.48.120:59293] Access denied: 'mhamilton'
GET middlewareAutomation:/

If I change the groups section to the following:
[groups]
poc_dev = mhamilton,aobst
poc_mgr = jvogel,rsebaugh

and the repo sections to the following:
[webadmin:/]
@poc_dev = rw
@poc_mgr = r

[jenkinsAdmin:/]
@poc_mgr = rw
@poc_dev = r

[middlewareAutomation:/]
@poc_dev = rw
@poc_mgr = r

It works (but only if I prefix the group names with "@" in the repo
section.  I tried this with the groups defined using the aliases and I get
the same access denied messages.


>
-- 

Matthew Hamilton


Re: Question regarding mod_authnz_svn configurations

2014-03-14 Thread Philip Martin
Matthew Hamilton  writes:

> I would like to be able to define the groups based on ldap groups
>
> [groups]
> proj1-devs = CN=proj1_developers,ou=ldap,dc=mycorp,dc=com
> proj2-devs = CN=proj2_developers,ou=ldap,dc=mycorp,dc=com
>
> [proj1:/]
> proj1-devs = rw
> proj2-devs = r
>
> [proj2:/]
> proj1-devs = r
> proj2-devs = rw

Can you do this with aliases?

[aliases]
proj1-devs-ldap = CN=proj1_developers,ou=ldap,dc=mycorp,dc=com

[groups]
proj1-devs = &proj1-devs-ldap

[proj1:/]
proj1-devs = rw

-- 
Philip Martin | Subversion Committer
WANdisco // *Non-Stop Data*


Question regarding mod_authnz_svn configurations

2014-03-14 Thread Matthew Hamilton
I have read the Subversion book regarding the configuration of
mod_authnz_svn and mod_dav_svn for apache as the Subversion server.

I am making use of mod_authnz_ldap to restrict access to our repositories
based on ldap-group membership and we are using Active Directory as our
LDAP server.

I want to also be able to set up path-based authorization and have the
access based on the users ldap-group membership.

I.E. currently the AuthzSVNAccessFile has the [groups] section but the only
valid value that seems to work is the user name that the user authenticated
with.

[groups]
proj1-devs = marry, jane, jim, bob
proj2-dev = jill, jack, alex

[proj1:/]
proj1-devs = rw
proj2-devs = r

[proj2:/]
proj1-devs = r
proj2-devs = rw


I would like to be able to define the groups based on ldap groups

[groups]
proj1-devs = CN=proj1_developers,ou=ldap,dc=mycorp,dc=com
proj2-devs = CN=proj2_developers,ou=ldap,dc=mycorp,dc=com

[proj1:/]
proj1-devs = rw
proj2-devs = r

[proj2:/]
proj1-devs = r
proj2-devs = rw


This way we don't have to update the access file each time a new user is
added to the ldap group.


Are there any plans to introduce this kind of functionality to
mod_authnz_svn?

Thanks

-- 

Matthew Hamilton