Re: (unknown)

[Daniel Shahaf]

Michal Matyl wrote on Thu, Feb 11, 2016 at 10:19:02 +:
> The example is about a simple branch merging with default settings and
> a classic conflict situation, no fancy features or complex
> trunk-to-branch back merging, so I belive simple prose description of
> the problem is enough.

The prose did not suffice: I would not have understood the problem
without the attachment.  The preferred way to describe a bug is by
a script that reproduces it.

For future reference, we provide template scripts at:
https://subversion.apache.org/docs/community-guide/issues.html#reporting-bugs
(fourth paragraph)

> First developer creates branch-01 and inserts few lines into existing
> file. Another developer creates branch-02 and makes exactly the same
> changes as first developer, i.e. inserts the same lines with the same
> content. The only difference in the second's developer branch is
> whitespace change (space/tab doesn't matter) in a line preceding
> inserted lines.
> 

You are describing a merge where

* The difference between the OLD and MINE is:

Index: branches/branch-01/test_file.txt
===
--- branches/branch-01/test_file.txt(revision 3)
+++ branches/branch-01/test_file.txt(revision 4)
@@ -1,6 +1,9 @@
 A
 B
 C
+D
+E
+F
 J
 K
 L
\ No newline at end of file

* The difference between OLD and THEIRS is:

Index: branches/branch-02/test_file.txt
===
--- branches/branch-02/test_file.txt(revision 6)
+++ branches/branch-02/test_file.txt(revision 7)
@@ -1,6 +1,9 @@
 A
 B
-C
+ C
+D
+E
+F
 J
 K
 L
\ No newline at end of file

* There are no local mods.

That merge results in:

Index: trunk/test_file.txt
===
--- trunk/test_file.txt (revision 7)
+++ trunk/test_file.txt (revision 8)
@@ -1,9 +1,12 @@
 A
 B
-C
+ C
 D
 E
 F
+D
+E
+F
 J
 K
 L
\ No newline at end of file

Yes, I also think that is a bug: a text conflict should have been
flagged.

Could you please file an issue for this?

If you'd like to help fixing the bug, submitting a regression test (as
a patch against subversion/tests/cmdline/) would be a great first step.

I tested with 1.9.3.

Thanks,

Daniel

Re: Apache 2.4, Worker MPM, SVN 1.7.20, MOD_DAV_SVN and Post-Commit Hooks

[Daniel Shahaf]

Steffen Moser wrote on Fri, Feb 12, 2016 at 17:24:16 +0100:
> After learning this, I had a look at the HTTPS part of my site-specific
> Apache configuration (/etc/apache2/2.4/sites.d/...). There I found a
> strange configuration line:
> 
>   SSLCryptoDevice pkcs11

For future reference, you can run tests over ssl by passing USE_SSL=1 to
davautocheck, see comments in subversion/tests/cmdline/davautocheck.sh.

RE: Commit Error using ms onedrive repo

[Bert Huijben]

> -Original Message-
> From: dennisj2 [mailto:djorge...@gmail.com]
> Sent: zondag 14 februari 2016 01:22
> To: users@subversion.apache.org
> Subject: Commit Error using ms onedrive repo
> 
> I have a basic cloud setup, primary windows 10 client with onedrive
> installed, and a remote server pointing to the onedrive url - I have full
> access to the repository and can update, export, et.al., but cannot commit
> changes made on the remote server. I get the following errors:
> 
> 
> 
> Thought this was going to be easy, thought wrong. Help?

file:/// access to a repository really needs a real filesystem behind the
local path you use. Onedrive (when mapped as a drive letter) doesn't provide
the proper filesystem semantics needed to directy store a Subversion
filesystem.

I wouldn't recommend storing a Subversion repository in a local directory
shadowed to onedrive/dropbox/other-store via its app either, as that doesn't
provide the necessary guarantees either.

Subversion really needs full read, write, lock, move, etc. access to the
repository to guarantee stable behavior.

If you want to run Subversion against some cloud you should install some
server (Apache Httpd, svnserve) in the cloud and use a proper network layer
to access it. File based repository access isn't designed for that scenario,
and will most likely cause problems if you somehow get it running... 


The documentation even documents that you shouldn't run repositories on
network drives that don't provide the necessary ACID behavior.

Bert

RE: Commit Error using ms onedrive repo

[dennisj2]

Thanks Bert, -

Ok, so, then I really need a cloud based repository. Do you have any
recommendations on setting up shoestring cloud based svn repository?



--
View this message in context: 
http://subversion.1072662.n5.nabble.com/Commit-Error-using-ms-onedrive-repo-tp196123p196129.html
Sent from the Subversion Users mailing list archive at Nabble.com.

Re: Commit Error using ms onedrive repo

[Joseph Bruni]

> On Feb 14, 2016, at 10:26 AM, dennisj2  wrote:
> 
> Thanks Bert, -
> 
> Ok, so, then I really need a cloud based repository. Do you have any
> recommendations on setting up shoestring cloud based svn repository?


Beanstalkapp.com provides low cost SVN hosting.

files always reported as reverted for different owner

[Oleksiy Zagorskyi]

Is that ok?

When I do "svn revert" using for example "root" account, but files in 
the folder are owned by different user, then every file is reported as 
reverted but actually there is nothing to be reverted?

Such wrong messages mislead a lot!

An example:
root@it0:/zab/www-dev/trunk# whoami
root

root@it0:/zab/www-dev/trunk# ls -l users.php
-rw-r--r-- 1 zalex zalex 13689 Jan 18 16:00 users.php

root@it0:/zab/www-dev/trunk# svn st

root@it0:/zab/www-dev/trunk# svn revert users.php
Reverted 'users.php'

root@it0:/zab/www-dev/trunk# svn revert users.php
Reverted 'users.php'

root@it0:/zab/www-dev/trunk# svn revert users.php
Reverted 'users.php'


In short to reproduce: a file owner and "svn revert" command issuer are 
different users.


Tried to find something related at 
https://issues.apache.org/jira/issues/?jql=project%20%3D%20SVN%20AND%20text%20~%20"revert"; 
or google it - nothing found.


--
Oleksiy