Re: [RFC] Revision property caching and named atomics

2014-08-22 Thread Branko Čibej
On 22.08.2014 01:39, Evgeny Kotkov wrote: We (Sergey Raevskiy sergey.raevs...@visualsvn.com and I) had some time to examine the revision property caching feature, and there are some conclusions that we would like to share. In brief, there are certain conditions when this feature can

Re: svn commit: r1619418 - in /subversion/trunk/subversion: libsvn_wc/conflicts.c svn/cl-conflicts.c tests/cmdline/switch_tests.py tests/cmdline/tree_conflict_tests.py tests/libsvn_wc/conflict-data-te

2014-08-22 Thread Branko Čibej
On 21.08.2014 15:51, s...@apache.org wrote: Author: stsp Date: Thu Aug 21 14:51:35 2014 New Revision: 1619418 URL: http://svn.apache.org/r1619418 Log: Fix misreporting of tree conflict victim's node kind, in particular in cases where the victim is an obstruction. *

Wunused-but-set-parameter warning in svn_wc_get_diff_editor6

2014-08-22 Thread Philip Martin
I see this: ../src/subversion/libsvn_wc/deprecated.c: In function 'svn_wc_get_diff_editor6': ../src/subversion/libsvn_wc/deprecated.c:1991:39: warning: parameter 'ignore_ancestry' set but not used [-Wunused-but-set-parameter] It was added in 1569697. Is this bit redundant or is something

Re: svn commit: r1619717 - /subversion/trunk/subversion/libsvn_wc/conflicts.c

2014-08-22 Thread Stefan Sperling
On Fri, Aug 22, 2014 at 09:29:27AM -, rhuij...@apache.org wrote: Author: rhuijben Date: Fri Aug 22 09:29:27 2014 New Revision: 1619717 URL: http://svn.apache.org/r1619717 * subversion/libsvn_wc/conflicts.c (read_tree_conflict_desc): Don't

RE: svn commit: r1619717 - /subversion/trunk/subversion/libsvn_wc/conflicts.c

2014-08-22 Thread Bert Huijben
-Original Message- From: Stefan Sperling [mailto:s...@elego.de] Sent: vrijdag 22 augustus 2014 11:51 To: dev@subversion.apache.org Subject: Re: svn commit: r1619717 - /subversion/trunk/subversion/libsvn_wc/conflicts.c On Fri, Aug 22, 2014 at 09:29:27AM -, rhuij...@apache.org

Re: [RFC] Revision property caching and named atomics

2014-08-22 Thread Evgeny Kotkov
I pointed this out here in Sheffield yesterday when I proposed that we just rip out revprop caching from 1.8 and trunk, because there's no way to make it work for the kind of configurations that would need it most (i.e., large installations with multiple servers and load balancing). There

Re: svn commit: r1619717 - /subversion/trunk/subversion/libsvn_wc/conflicts.c

2014-08-22 Thread Stefan Sperling
On Fri, Aug 22, 2014 at 12:26:12PM +0200, Bert Huijben wrote: I'm not sure this should even be flagged as a conflict. However, the victim node kind is wrong. I think it should say local file delete, ... (but local, left-src and right-src are all victims) As already mentioned on IRC, when

Re: Revprop caching plan

2014-08-22 Thread Stefan Sperling
On Fri, Aug 22, 2014 at 12:50:40PM +0200, Stefan Fuhrmann wrote: Remaining restrictions: * All processes modifying revprops must use 1.9 or later libraries or revprop caching cannot be used. Does this mean that using file:// with 'svn' 1.9, or using svnadmin or svnlook 1.9, won't be

Re: Revprop caching plan

2014-08-22 Thread Stefan Fuhrmann
On Fri, Aug 22, 2014 at 12:57 PM, Stefan Sperling s...@elego.de wrote: On Fri, Aug 22, 2014 at 12:50:40PM +0200, Stefan Fuhrmann wrote: Remaining restrictions: * All processes modifying revprops must use 1.9 or later libraries or revprop caching cannot be used. Does this mean that

RE: Wunused-but-set-parameter warning in svn_wc_get_diff_editor6

2014-08-22 Thread Bert Huijben
-Original Message- From: Julian Foad [mailto:julianf...@btopenworld.com] Sent: vrijdag 22 augustus 2014 12:52 To: Philip Martin Cc: dev@subversion.apache.org; Bert Huijben Subject: Re: Wunused-but-set-parameter warning in svn_wc_get_diff_editor6 Philip Martin wrote:

Re: svn commit: r1619452 - in /subversion/trunk/subversion: libsvn_client/diff.c tests/cmdline/diff_tests.py

2014-08-22 Thread Julian Foad
Bert Huijben wrote: Julian Foad wrote: URL: http://svn.apache.org/r1619452 Log: Fix the copy-from revision number reported in a diff header. It previously reported 'nonexistent' instead of the copy-from revision in some cases. This bug seems to be a regression; 1.8.x releases show

Re: Revprop caching plan

2014-08-22 Thread Stefan Sperling
On Fri, Aug 22, 2014 at 01:31:08PM +0200, Stefan Fuhrmann wrote: People will get an error if one of the currently released 1.8 server with revprop caching enabled or svnadmin change a revprop. In that case, a 1.9 process using revprop caching will error out upon revprop access. Local

Re: Revprop caching plan

2014-08-22 Thread Stefan Fuhrmann
On Fri, Aug 22, 2014 at 1:56 PM, Stefan Sperling s...@elego.de wrote: On Fri, Aug 22, 2014 at 01:31:08PM +0200, Stefan Fuhrmann wrote: People will get an error if one of the currently released 1.8 server with revprop caching enabled or svnadmin change a revprop. In that case, a 1.9 process

Re: Wunused-but-set-parameter warning in svn_wc_get_diff_editor6

2014-08-22 Thread Philip Martin
Bert Huijben b...@qqmail.nl writes: Philip Martin wrote: ../src/subversion/libsvn_wc/deprecated.c: In function 'svn_wc_get_diff_editor6': ../src/subversion/libsvn_wc/deprecated.c:1991:39: warning: parameter 'ignore_ancestry' set but not used [-Wunused-but-set-parameter] It was added

Re: Revprop caching plan

2014-08-22 Thread Branko Čibej
On 22.08.2014 12:56, Stefan Sperling wrote: On Fri, Aug 22, 2014 at 01:31:08PM +0200, Stefan Fuhrmann wrote: People will get an error if one of the currently released 1.8 server with revprop caching enabled or svnadmin change a revprop. In that case, a 1.9 process using revprop caching will

Re: Wunused-but-set-parameter warning in svn_wc_get_diff_editor6

2014-08-22 Thread Julian Foad
The 'ignore_ancestry' flag should probably be passed to svn_wc__get_diff_editor(..., ignore-ancestry=ignore_ancestry, ...) instead of passing (..., ignore_ancestry=use_git_diff_format, ...). But then where should 'use_git_diff_format' be used? Bert wrote: The git_diff flag, triggers a lot of