Re: Files added to repository by others don't come down with 'svn update'

2014-01-19 Thread Yuri
In continuation of out previous discussion, I got another report that 
another user got the same files in 'deleted' state, although he never 
deleted them by hand. Same symptoms.
Look for the comment on Sat, 18 Jan 2014 20:56:33 -0800 in this PR: 
http://www.freebsd.org/cgi/query-pr.cgi?pr=185261
(Previously I thought that I just did something wrong, or maybe 
unconsciously hit 'resolved' option without remembering)


I am pretty sure that 'svn update' marks certain files as 'deleted' 
without user ever doing 'svn delete' or resolving any conflict on them.


Somebody needs to take a close look how is this is possible.

Yuri


Re: Files added to repository by others don't come down with 'svn update'

2014-01-19 Thread Branko Čibej
On 19.01.2014 09:06, Yuri wrote:
> In continuation of out previous discussion, I got another report that
> another user got the same files in 'deleted' state, although he never
> deleted them by hand. Same symptoms.

"Base deleted" is not the same as the file being deleted. It's been said
before, but it'll happen if you update when a file was deleted in the
repository, but modified in your working copy. This should result in a
tree conflict.

> Look for the comment on Sat, 18 Jan 2014 20:56:33 -0800 in this PR:
> http://www.freebsd.org/cgi/query-pr.cgi?pr=185261

I see here:
https://www.freebsd.org/doc/en/articles/committers-guide/subversion-primer.html

that FreeBSD uses (or perhaps suggests using) a variant of Subversion
with FreeBSD-specific patches. The only reference I find to Subversion
in this problem report is that there's "a Subversion problem of some
sort." Hardly helpful

> (Previously I thought that I just did something wrong, or maybe
> unconsciously hit 'resolved' option without remembering)
>
> I am pretty sure that 'svn update' marks certain files as 'deleted'
> without user ever doing 'svn delete' or resolving any conflict on them.
>
> Somebody needs to take a close look how is this is possible.

For starters, somebody can take the time to confirm that stock
Subversion without FreeBSD-specific patches behaves the same way. Sorry
if that sounds a bit untrustful, but frankly, I can't recall seeing the
problem you report in any release version of Subversion, so I have my
doubts.

-- Brane


-- 
Branko Čibej | Director of Subversion
WANdisco // Non-Stop Data
e. br...@wandisco.com


Re: Invalid command 'SVNMasterURI' in configuring svn write-through

2014-01-19 Thread WilliamBai
Thank you for your valuable suggestion very much. I've collected all the
LoadModule part, and commented out the duplicated part, but it seems still
report the same error.

Currently the LoadModule in my httpd configuration is like following:
grep LoadModule /etc/httpd/conf/httpd.conf

 grep LoadModule /etc/httpd/conf/httpd.conf
# have to place corresponding `LoadModule' lines at this location so the
# LoadModule foo_module modules/mod_foo.so
LoadModule auth_basic_module modules/mod_auth_basic.so
LoadModule auth_digest_module modules/mod_auth_digest.so
LoadModule authn_file_module modules/mod_authn_file.so
LoadModule authn_alias_module modules/mod_authn_alias.so
LoadModule authn_anon_module modules/mod_authn_anon.so
LoadModule authn_dbm_module modules/mod_authn_dbm.so
LoadModule authn_default_module modules/mod_authn_default.so
LoadModule authz_host_module modules/mod_authz_host.so
LoadModule authz_user_module modules/mod_authz_user.so
LoadModule authz_owner_module modules/mod_authz_owner.so
LoadModule authz_groupfile_module modules/mod_authz_groupfile.so
LoadModule authz_dbm_module modules/mod_authz_dbm.so
LoadModule authz_default_module modules/mod_authz_default.so
#LoadModule ldap_module modules/mod_ldap.so
#LoadModule authnz_ldap_module modules/mod_authnz_ldap.so
LoadModule include_module modules/mod_include.so
LoadModule log_config_module modules/mod_log_config.so
LoadModule logio_module modules/mod_logio.so
LoadModule env_module modules/mod_env.so
LoadModule ext_filter_module modules/mod_ext_filter.so
LoadModule mime_magic_module modules/mod_mime_magic.so
LoadModule expires_module modules/mod_expires.so
LoadModule deflate_module modules/mod_deflate.so
LoadModule headers_module modules/mod_headers.so
LoadModule usertrack_module modules/mod_usertrack.so
LoadModule setenvif_module modules/mod_setenvif.so
LoadModule mime_module modules/mod_mime.so
LoadModule dav_module modules/mod_dav.so
LoadModule status_module modules/mod_status.so
LoadModule autoindex_module modules/mod_autoindex.so
LoadModule info_module modules/mod_info.so
LoadModule dav_fs_module modules/mod_dav_fs.so
LoadModule vhost_alias_module modules/mod_vhost_alias.so
LoadModule negotiation_module modules/mod_negotiation.so
LoadModule dir_module modules/mod_dir.so
LoadModule actions_module modules/mod_actions.so
LoadModule speling_module modules/mod_speling.so
LoadModule userdir_module modules/mod_userdir.so
LoadModule alias_module modules/mod_alias.so
LoadModule rewrite_module modules/mod_rewrite.so
LoadModule proxy_module modules/mod_proxy.so
LoadModule proxy_balancer_module modules/mod_proxy_balancer.so
LoadModule proxy_ftp_module modules/mod_proxy_ftp.so
LoadModule proxy_http_module modules/mod_proxy_http.so
LoadModule proxy_connect_module modules/mod_proxy_connect.so
LoadModule cache_module modules/mod_cache.so
LoadModule suexec_module modules/mod_suexec.so
LoadModule disk_cache_module modules/mod_disk_cache.so
LoadModule file_cache_module modules/mod_file_cache.so
LoadModule mem_cache_module modules/mod_mem_cache.so
LoadModule cgi_module modules/mod_cgi.so
LoadModule version_module modules/mod_version.so
#LoadModule cern_meta_module modules/mod_cern_meta.so
#LoadModule asis_module modules/mod_asis.so
LoadModule dav_svn_module modules/mod_dav_svn.so
LoadModule authz_svn_module modules/mod_authz_svn.so
--

grep -r LoadModule /etc/httpd/conf.d/*
-
 /etc/httpd/conf.d/php.conf:LoadModule php5_module modules/libphp5.so
/etc/httpd/conf.d/proxy_ajp.conf:LoadModule proxy_ajp_module
modules/mod_proxy_ajp.so
-

Now executing "apachectl restart" and get the result:

apachectl: Configuration syntax error, will not run "restart":
Syntax error on line 5 of /etc/httpd/conf/extra/httpd-svn.conf:
Invalid command 'SVNMasterURI', perhaps misspelled or defined by a module
not included in the server configuration
-

Not sure what causes this.

William






--
View this message in context: 
http://subversion.1072662.n5.nabble.com/Invalid-command-SVNMasterURI-in-configuring-svn-write-through-tp186659p186664.html
Sent from the Subversion Users mailing list archive at Nabble.com.


Re: what do I hash to get .subversion/auth/svn.simple file name?

2014-01-19 Thread bosmolskate
Complicated coding going on here, but I think it is starting to make more
sense to me



-
http://www.seooptimizers.com 
http://yourinternetmarketers.com 
news blog 
seo courses 




--
View this message in context: 
http://subversion.1072662.n5.nabble.com/what-do-I-hash-to-get-subversion-auth-svn-simple-file-name-tp186470p18.html
Sent from the Subversion Users mailing list archive at Nabble.com.