Re: Non-Tracked Merge doc

2014-06-27 Thread Matt Phipps
Thanks! Also, good point about reverse merges, I forgot all about that. -Matt

Re: [serf-dev] Plan to release serf 1.4.0 (+ TODO list)

2014-06-27 Thread Lieven Govaerts
On Thu, Jun 26, 2014 at 2:14 PM, Ivan Zhakov wrote: > On 22 June 2014 14:13, Lieven Govaerts wrote: >> Hi, >> >> >> I propose we start planning a serf 1.4 release. >> >> Serf trunk has some features that will be used in the upcoming >> Subversion 1.9, so I'd like to get 1.4 out when the Subversio

Re: svn commit: r1604421 - in /subversion/trunk: subversion/libsvn_fs_fs/ subversion/tests/cmdline/ subversion/tests/libsvn_fs_fs/ tools/server-side/svnfsfs/

2014-06-27 Thread Ivan Zhakov
On 26 June 2014 19:08, Stefan Fuhrmann wrote: > > > On Thu, Jun 26, 2014 at 11:52 AM, Ivan Zhakov wrote: >> >> On 25 June 2014 22:11, Daniel Shahaf wrote: >> > Ivan Zhakov wrote on Wed, Jun 25, 2014 at 20:03:11 +0400: >> >> On 25 June 2014 19:54, Stefan Fuhrmann >> >> wrote: >> >> > On Wed, Jun

serf connection reset SEGV after timeout

2014-06-27 Thread Philip Martin
Using serf 1.3.x@2383 I see a SEGV after an HTTP timeout due to serf's pool cleanups accessing memory after it has been released. I have a post-commit script that takes longer than the client's http-timeout and I see this: valgrind -q subversion/svn/.libs/lt-svn import -mm repo/format http://loc

Re: Non-Tracked Merge doc

2014-06-27 Thread Julian Foad
Matt Phipps wrote: > Hi dev list, > > I saw a section in > https://wiki.apache.org/subversion/SupportedMergeScenarios saying > about non-tracked merges: "### WHICH MERGES ARE THESE? WHEN ARE THEY > APPROPRIATE? WHEN DO THEY HAPPEN SILENTLY?" > > A merge like that would make sense if you wanted to