RE: Automatic tree conflicts resolution during svn update

2013-06-11 Thread Bert Huijben
> -Original Message- > From: Julian Foad [mailto:julianf...@btopenworld.com] > Sent: woensdag 12 juni 2013 00:28 > To: Bert Huijben > Cc: Stefan Sperling; 'Johan Corveleyn'; 'Subversion Development' > Subject: Re: Automatic tree conflicts resolution during svn update > > Bert Huijben wro

Re: Automatic tree conflicts resolution during svn update

2013-06-11 Thread C. Michael Pilato
On 06/12/2013 12:28 AM, Julian Foad wrote: >>> > FYI, this is what the new output looks like: >>> > >>> > $ svn up -r3 >>> > Updating '.': >>> >C alpha >>> > At revision 3. >>> > Summary of conflicts: >>> > Tree conflicts: 1 >>> > Tree conflict on 'alpha' >>> >> local file moved

Re: Automatic tree conflicts resolution during svn update

2013-06-11 Thread Julian Foad
Bert Huijben wrote: >> -Original Message- >> From: Johan Corveleyn [mailto:jcor...@gmail.com] >> Sent: dinsdag 11 juni 2013 23:37 >> To: Subversion Development >> Subject: Re: Automatic tree conflicts resolution during svn update >> >> On Tue, Jun 11, 2013 at 4:27 PM, Stefan Sperlin

RE: Automatic tree conflicts resolution during svn update

2013-06-11 Thread Bert Huijben
> -Original Message- > From: Johan Corveleyn [mailto:jcor...@gmail.com] > Sent: dinsdag 11 juni 2013 23:37 > To: Subversion Development > Subject: Re: Automatic tree conflicts resolution during svn update > > On Tue, Jun 11, 2013 at 4:27 PM, Stefan Sperling wrote: > > On Tue, Jun 11, 20

Re: Automatic tree conflicts resolution during svn update

2013-06-11 Thread Johan Corveleyn
On Tue, Jun 11, 2013 at 4:27 PM, Stefan Sperling wrote: > On Tue, Jun 11, 2013 at 02:12:14PM +0200, Stefan Sperling wrote: >> On Mon, Jun 10, 2013 at 07:21:19PM +0400, Danil Shopyrin wrote: >> > The current draft of the Subversion 1.8 Release Notes announces >> > automatic tree conflicts resolutio

Re: svn 1.8 migration - directory deltification and revprop packing

2013-06-11 Thread Daniel Shahaf
C. Michael Pilato wrote on Tue, Jun 11, 2013 at 17:32:59 +0200: > On 06/11/2013 05:14 PM, Daniel Shahaf wrote: > > C. Michael Pilato wrote on Tue, Jun 11, 2013 at 14:52:48 +0200: > >> As for the --deltas option, that has nothing in the world to do with the > >> types of deltas we're discussing here

Re: svn 1.8 migration - directory deltification and revprop packing

2013-06-11 Thread C. Michael Pilato
On 06/11/2013 05:14 PM, Daniel Shahaf wrote: > C. Michael Pilato wrote on Tue, Jun 11, 2013 at 14:52:48 +0200: >> As for the --deltas option, that has nothing in the world to do with the >> types of deltas we're discussing here. (As an aside, I would highly >> recommend that, unless you need your

Re: svn 1.8 migration - directory deltification and revprop packing

2013-06-11 Thread Daniel Shahaf
C. Michael Pilato wrote on Tue, Jun 11, 2013 at 14:52:48 +0200: > One advantage of being in a room full of Subversion developers, specifically > the guy that implemented all this stuff, is that I can ask him directly > about how to respond to this mail. :-) Hopefully I will accurately > represent

Re: Long delta chains edge case revived

2013-06-11 Thread Stefan Fuhrmann
On Mon, Jun 10, 2013 at 2:00 PM, Daniel Shahaf wrote: > From fs_fs.c:choose_delta_base(): > > svn_boolean_t maybe_shared_rep = FALSE; > if (!props && base->data_rep && svn_fs_fs__id_rev(base->id) > > base->data_rep->revision) > maybe_shared_rep = TRUE; > > The third conjunct was inte

Re: Automatic tree conflicts resolution during svn update

2013-06-11 Thread Stefan Sperling
On Tue, Jun 11, 2013 at 02:12:14PM +0200, Stefan Sperling wrote: > On Mon, Jun 10, 2013 at 07:21:19PM +0400, Danil Shopyrin wrote: > > The current draft of the Subversion 1.8 Release Notes announces > > automatic tree conflicts resolution for locally moved files and > > directories. But it seems th

Re: [RFC, PATCH] RA context abstraction layer in libsvn_client

2013-06-11 Thread Ivan Zhakov
On Tue, Jun 11, 2013 at 3:56 PM, Bert Huijben wrote: > > >> Hi, >> >> Currently Subversion client layer creates new RA session for every >> svn_client_* call. Even more: for some operations like >> svn_client_merge() it creates 10-15 RA sessions. Each session creation >> takes significant amount o

RE: [RFC, PATCH] RA context abstraction layer in libsvn_client

2013-06-11 Thread Bert Huijben
> -Original Message- > From: Ivan Zhakov [mailto:i...@visualsvn.com] > Sent: dinsdag 11 juni 2013 15:22 > To: Subversion Development > Subject: [RFC, PATCH] RA context abstraction layer in libsvn_client > > Hi, > > Currently Subversion client layer creates new RA session for every > svn

[RFC, PATCH] RA context abstraction layer in libsvn_client

2013-06-11 Thread Ivan Zhakov
Hi, Currently Subversion client layer creates new RA session for every svn_client_* call. Even more: for some operations like svn_client_merge() it creates 10-15 RA sessions. Each session creation takes significant amount of time: TCP connection, SSL handshake, authentication and initial handshake

Re: svn commit: r1491765 - /subversion/site/publish/docs/release-notes/1.8.html

2013-06-11 Thread Daniel Shahaf
Branko Čibej wrote on Tue, Jun 11, 2013 at 14:50:51 +0200: > On 11.06.2013 14:38, stef...@apache.org wrote: > > Author: stefan2 > > Date: Tue Jun 11 12:38:53 2013 > > New Revision: 1491765 > > > > URL: http://svn.apache.org/r1491765 > > Log: > > * site/publish/docs/release_notes/1.8.html > > (fsf

Re: svn commit: r1491765 - /subversion/site/publish/docs/release-notes/1.8.html

2013-06-11 Thread Branko Čibej
On 11.06.2013 14:38, stef...@apache.org wrote: > Author: stefan2 > Date: Tue Jun 11 12:38:53 2013 > New Revision: 1491765 > > URL: http://svn.apache.org/r1491765 > Log: > * site/publish/docs/release_notes/1.8.html > (fsfs-deltification): say why we don't enable it by default and what > caches t

Re: Automatic tree conflicts resolution during svn update

2013-06-11 Thread Stefan Sperling
On Mon, Jun 10, 2013 at 07:21:19PM +0400, Danil Shopyrin wrote: > The current draft of the Subversion 1.8 Release Notes announces > automatic tree conflicts resolution for locally moved files and > directories. But it seems that this feature does not actually work in > RC2. The detailed reproductio

[svnbench] Revision: 1491743 compiled Jun 11 2013, 11:22:42 on x86_64-unknown-linux-gnu

2013-06-11 Thread neels
1.7.0@1181106 vs. trunk@1491739 Started at Tue Jun 11 11:27:07 UTC 2013 *DISCLAIMER* - This tests only file://-URL access on a GNU/Linux VM. This is intended to measure changes in performance of the local working copy layer, *only*. These results are *not* generally true for everyone. Charts of t

Re: [Patch] Fix for issue 4364

2013-06-11 Thread Daniel Shahaf
Review of the formatting only (not of the patch substance): Markus Schaber wrote on Tue, Jun 11, 2013 at 11:13:44 +: > * subversion/libsvn_wc/adm_ops.c > (process_committed_leaf): In the shortcut for deleted nodes, pass TRUE to > remove the locks recursively. Wrap to 80 chars please. > @@

Re: svn commit: r1480412 - /subversion/trunk/subversion/bindings/swig/ruby/test/util.rb

2013-06-11 Thread Ben Reser
On Fri, Jun 7, 2013 at 4:52 PM, Ben Reser wrote: > I really don't understand why this change is necessary at all since as > you can see above the source tree is added to the load path with -I. So I think I understand the logic here. Windows doesn't seem to have any wrapper for running the swig t

[Patch] Fix for issue 4364

2013-06-11 Thread Markus Schaber
Hi, See attached the patch to fix issue 4364. [[[ Fix issue #4364: Correctly remove the stale entries from the lock table when committing deletions. * subversion/libsvn_client/commit.c (post_process_commit_item): always pass the flag to remove locks for deleted and replaced items. * subvers

RE: Review of invoke-diff-cmd-feature branch

2013-06-11 Thread Bert Huijben
I don't like the command.com like scheme either. A scheme like that of sh or a strict ${pattern} is far more extensible and far less likely to collide with other use cases. The windows scheme doesn't support anything more than ascii variable names, while many implementations have different workaro

Re: Review of invoke-diff-cmd-feature branch

2013-06-11 Thread Branko Čibej
On 11.06.2013 10:45, Julian Foad wrote: > If there's a scheme that we're already using in Subversion, that would > be a good choice. Is there one? Yes; the one we already use in config files, which is a ripoff from Python. In this case you'd have to use %%(foo)s in the config file instead of %(fo

Re: svn commit: r1490326 - /subversion/trunk/tools/server-side/svnpubsub/svnpubsub/server.py

2013-06-11 Thread Daniel Shahaf
Ben Reser wrote on Tue, Jun 11, 2013 at 09:53:59 +0100: > On Mon, Jun 10, 2013 at 9:35 AM, Daniel Shahaf > wrote: > > Perhaps leave it in? It's little overhead to maintain and might make > > somebody's life easier. > > If you want to put it in that's fine. But at this point I don't think > it'

Re: svn commit: r1490326 - /subversion/trunk/tools/server-side/svnpubsub/svnpubsub/server.py

2013-06-11 Thread Ben Reser
On Mon, Jun 10, 2013 at 9:35 AM, Daniel Shahaf wrote: > Perhaps leave it in? It's little overhead to maintain and might make > somebody's life easier. If you want to put it in that's fine. But at this point I don't think it'll be in 1.8.0 since I merged the change removing it.

Re: Review of invoke-diff-cmd-feature branch

2013-06-11 Thread Julian Foad
Daniel Shahaf wrote: > Gabriela Gibson wrote on Mon, Jun 10, 2013 at 23:39:45 +0100: >> On 6/10/13, Daniel Shahaf wrote: [...] >> >> --    >> >> >> >> + How does this parse "%%%f1%"? Is "%%f1%%" an error? >> >> >> >> %%%f1% becomes %%f1% and %%f1%% becomes %f1%%, ne

Re: 1.8.0-rc3 up for testing/signing

2013-06-11 Thread Ivan Zhakov
On Thu, Jun 6, 2013 at 11:01 PM, Ben Reser wrote: > Here it is: the second Release Candidate for Subversion 1.8.0. You can > fetch the proposed tarballs from here: > https://dist.apache.org/repos/dist/dev/subversion > > The magic rev is r1490375 > Summary: +1 to release. TESTED: -