Re: [PATCH] fix kwallet-related crash when solving conflicts

2012-12-12 Thread Ben Reser
On Wed, Dec 12, 2012 at 3:04 PM, Lekensteyn wrote: > Further debugging revealed that a child process of svn segfaults and that this > happens because of misuse of apr_pool_cleanup_register. That function does not > accept null helpers. I've grepped the svn repo and the kwallet auth code is > the o

[PATCH] fix kwallet-related crash when solving conflicts

2012-12-12 Thread Lekensteyn
Hi, I experienced a segfault when trying to resolve a conflict while updating: Conflict discovered in 'somefile'. Select: (p) postpone, (df) diff-full, (e) edit, (mc) mine-conflict, (tc) theirs-conflict, (s) show all options: l Process '/path/to/shell-script/merge-cmd' failed (exit

Re: svn commit: r1417639 - in /subversion/trunk/subversion/mod_dav_svn: dav_svn.h mod_dav_svn.c reports/update.c

2012-12-12 Thread C. Michael Pilato
On 12/12/2012 04:23 PM, Lieven Govaerts wrote: > You're not reading my mails at all are you? ;) > That's what I suggested before, but I found later that it will not > work because the server can force the client to use skelta mode > (SVNAllowBulkUpdates Off). I'm starting to think I must have miss

Re: [PATCH] Test for line ending bug in svnrdump (issue 4263)

2012-12-12 Thread Daniel Shahaf
Ben Reser wrote on Wed, Dec 12, 2012 at 13:57:30 -0800: > On Tue, Dec 11, 2012 at 5:59 PM, Ben Reser wrote: > > I'd say that replacing '\r' with a '' is wrong. That would > > change the meaning of some properties. E.G. svn:ignore, svn:externals > > which use lines to handle individual records wi

Re: [PATCH] Test for line ending bug in svnrdump (issue 4263)

2012-12-12 Thread Ben Reser
On Tue, Dec 11, 2012 at 5:59 PM, Ben Reser wrote: > I'd say that replacing '\r' with a '' is wrong. That would > change the meaning of some properties. E.G. svn:ignore, svn:externals > which use lines to handle individual records within them. To be more explicit, I think you should change CR or

Re: svn commit: r1417639 - in /subversion/trunk/subversion/mod_dav_svn: dav_svn.h mod_dav_svn.c reports/update.c

2012-12-12 Thread C. Michael Pilato
On 12/12/2012 04:04 PM, Lieven Govaerts wrote: > Note that send-all is not the solution if the server insists on skelta > mode (see my previous comment), so if you do an update or a checkout, > you still have to tell serf to limit to one connection. And that's trickier than it seems, IIRC, because

Re: svn commit: r1417639 - in /subversion/trunk/subversion/mod_dav_svn: dav_svn.h mod_dav_svn.c reports/update.c

2012-12-12 Thread Lieven Govaerts
Mike, On Wed, Dec 12, 2012 at 10:15 PM, C. Michael Pilato wrote: > On 12/12/2012 03:30 PM, C. Michael Pilato wrote: >> On 12/12/2012 03:02 PM, Lieven Govaerts wrote: >>> On Tue, Dec 11, 2012 at 9:29 PM, C. Michael Pilato >>> wrote: Those technical challenges aside, I've since started to do

Re: svn commit: r1417639 - in /subversion/trunk/subversion/mod_dav_svn: dav_svn.h mod_dav_svn.c reports/update.c

2012-12-12 Thread C. Michael Pilato
On 12/12/2012 03:30 PM, C. Michael Pilato wrote: > On 12/12/2012 03:02 PM, Lieven Govaerts wrote: >> On Tue, Dec 11, 2012 at 9:29 PM, C. Michael Pilato >> wrote: >>> Those technical challenges aside, I've since started to doubt the wisdom of >>> adding special treatment of the starting revision t

Re: svn commit: r1417639 - in /subversion/trunk/subversion/mod_dav_svn: dav_svn.h mod_dav_svn.c reports/update.c

2012-12-12 Thread Lieven Govaerts
On Wed, Dec 12, 2012 at 9:30 PM, C. Michael Pilato wrote: > On 12/12/2012 03:02 PM, Lieven Govaerts wrote: >> On Tue, Dec 11, 2012 at 9:29 PM, C. Michael Pilato >> wrote: >>> Those technical challenges aside, I've since started to doubt the wisdom of >>> adding special treatment of the starting

Re: 1.7.8 up for testing/signing

2012-12-12 Thread C. Michael Pilato
On 12/12/2012 03:20 PM, Paul Burba wrote: > Hi Ben, > > Not until after I signed this did I recall your note about migrating > off of sha1 based keys -- > http://svn.haxx.se/dev/archive-2012-10/0073.shtml Glad you said something about this, Paul! I *did* remember that we were using stronger keys

Re: svn commit: r1417639 - in /subversion/trunk/subversion/mod_dav_svn: dav_svn.h mod_dav_svn.c reports/update.c

2012-12-12 Thread C. Michael Pilato
On 12/12/2012 03:02 PM, Lieven Govaerts wrote: > On Tue, Dec 11, 2012 at 9:29 PM, C. Michael Pilato > wrote: >> Those technical challenges aside, I've since started to doubt the wisdom of >> adding special treatment of the starting revision to this API anyway. I'll >> continue pondering other op

Re: 1.7.8 up for testing/signing

2012-12-12 Thread C. Michael Pilato
On 12/10/2012 05:07 PM, Ben Reser wrote: > The 1.7.8 release artifacts are now available for testing/signing. > Please get the tarballs from > https://dist.apache.org/repos/dist/dev/subversion > and add your signatures there. Summary: +1 to release. Platform: Linux 3.2.0-34-generic-pae

Re: 1.7.8 up for testing/signing

2012-12-12 Thread Paul Burba
On Mon, Dec 10, 2012 at 10:03 PM, Paul Burba wrote: > On Mon, Dec 10, 2012 at 5:07 PM, Ben Reser wrote: >> The 1.7.8 release artifacts are now available for testing/signing. >> Please get the tarballs from >> https://dist.apache.org/repos/dist/dev/subversion >> and add your signatures there. >>

Re: [PATCH] Prevent false negative results of "make check" in Python tests

2012-12-12 Thread Daniel Shahaf
Andreas Stieger wrote on Wed, Dec 12, 2012 at 20:01:11 +: > Hello, > > discussed on IRC, the patch below changes the test harness to prevent > some false negatives when running the test suite. Specifically, if a > python test initialisation returns in such a way that the test runner > doesn't

Re: svn commit: r1417639 - in /subversion/trunk/subversion/mod_dav_svn: dav_svn.h mod_dav_svn.c reports/update.c

2012-12-12 Thread Lieven Govaerts
On Tue, Dec 11, 2012 at 9:29 PM, C. Michael Pilato wrote: > On 12/10/2012 10:53 AM, C. Michael Pilato wrote: >> What if we revved the svn_ra_replay_range() API in such a way that it could >> now handle this "initial revision" scenario? We might add an 'incremental' >> flag that parallels what 'sv

[PATCH] Prevent false negative results of "make check" in Python tests

2012-12-12 Thread Andreas Stieger
Hello, discussed on IRC, the patch below changes the test harness to prevent some false negatives when running the test suite. Specifically, if a python test initialisation returns in such a way that the test runner doesn't know how to handle the result, change to code to return a non-zero exit co

Re: 1.7.8 up for testing/signing

2012-12-12 Thread Peter Samuelson
> http://anonscm.debian.org/viewvc/pkg-subversion/src/1.7.x/debian/patches/ (Or svn://anonscm.debian.org/pkg-subversion/src/1.7.x/debian/patches .)

Re: 1.7.8 up for testing/signing

2012-12-12 Thread Philip Martin
Philip Herron writes: > Ok cool never seen these ones there was probably a much older one i was > looking at where can i download these ones? http://anonscm.debian.org/viewvc/pkg-subversion/src/1.7.x/debian/patches/ -- Certified & Supported Apache Subversion Downloads: http://www.wandisco.com/

Re: 1.7.8 up for testing/signing

2012-12-12 Thread Philip Herron
Ok cool never seen these ones there was probably a much older one i was looking at where can i download these ones? --Phil On 12/12/12 11:56, Philip Martin wrote: > Philip Herron writes: > >> Which patch are you referring in paticular? > > subversion-1.7.5/debian/patches/apr-abi1 > subversion-

Re: mod_dav_svn assert on root location

2012-12-12 Thread Erez Zarum
I have recompiled with the patch, When trying to commit to the slave, the client receive: "Commit failed (details follow): Server sent unexpected return value (500 Internal Server Error) in response to MKACTIVITY request for '/!svn/act/12aad366-69cf-2b48-9303-bfb1220af919' And now the error is log

Re: mod_dav_svn assert on root location

2012-12-12 Thread Philip Martin
Erez Zarum writes: > I am trying to create a master slave configuration with proxy requests > through the slave, i have used this configuration on the slave: > > DAV svn > SVNPath /scratch/repo > >

Re: mod_dav_svn assert on root location

2012-12-12 Thread Daniel Shahaf
Erez Zarum wrote on Wed, Dec 12, 2012 at 15:33:08 +0200: > I am trying to create a master slave configuration with proxy requests > through the slave, i have used this configuration on the slave: > > DAV svn > SVNPath /scr

mod_dav_svn assert on root location

2012-12-12 Thread Erez Zarum
I am trying to create a master slave configuration with proxy requests through the slave, i have used this configuration on the slave: DAV svn SVNPath /scratch/repo SVNMasterURI

Re: svn commit: r1417926 - in /subversion/trunk/subversion/libsvn_wc: externals.c merge.c props.c props.h update_editor.c

2012-12-12 Thread Philip Martin
julianf...@apache.org writes: > Author: julianfoad > Date: Thu Dec 6 14:58:31 2012 > New Revision: 1417926 > > URL: http://svn.apache.org/viewvc?rev=1417926&view=rev > Log: > Remove the 'base_merge' parameter from svn_wc__merge_props(), instead > doing a 'base merge' iff the 'new_pristine_props'

Re: 1.7.8 up for testing/signing

2012-12-12 Thread Philip Martin
Philip Herron writes: > Which patch are you referring in paticular? subversion-1.7.5/debian/patches/apr-abi1 subversion-1.7.5/debian/patches/apr-abi2 Index: configure.ac === --- configure.ac(revision 1420608) +++ configure.

Re: svn commit: r1420404 - in /subversion/trunk/subversion/libsvn_wc: token-map.h wc-queries.sql

2012-12-12 Thread Philip Martin
Julian Foad writes: >> Author: philip > >> >> URL: http://svn.apache.org/viewvc?rev=1420404&view=rev >> Log: >> * subversion/libsvn_wc/token-map.h >>   (depth_map): Add some annotations. >> >> * subversion/libsvn_wc/wc-queries.sql >>   (STMT_HAS_SPARSE_NODES): Use annotations. > >> Modified: su

Re: svn commit: r1420477 - in /subversion/trunk: build.conf subversion/tests/libsvn_ra/ subversion/tests/libsvn_ra/ra-test.c

2012-12-12 Thread Daniel Shahaf
Daniel Shahaf wrote on Wed, Dec 12, 2012 at 13:21:07 +0200: > julianf...@apache.org wrote on Tue, Dec 11, 2012 at 22:42:55 -: > > +[ra-test] > > +description = Test a few things in libsvn_ra > > +type = exe > > +path = subversion/tests/libsvn_ra > > +sources = ra-test.c > > +install = test > >

Re: svn commit: r1420477 - in /subversion/trunk: build.conf subversion/tests/libsvn_ra/ subversion/tests/libsvn_ra/ra-test.c

2012-12-12 Thread Daniel Shahaf
julianf...@apache.org wrote on Tue, Dec 11, 2012 at 22:42:55 -: > +[ra-test] > +description = Test a few things in libsvn_ra > +type = exe > +path = subversion/tests/libsvn_ra > +sources = ra-test.c > +install = test > +libs = libsvn_test libsvn_ra libsvn_fs libsvn_delta libsvn_subr > + a

Re: 1.7.8 up for testing/signing

2012-12-12 Thread Philip Herron
On 11/12/12 16:11, Peter Samuelson wrote: > > [Philip Martin] >> I assume WANdisco's package is intended to replace the libraries in the >> standard Debian or Ubuntu libsvn1 package, in which case you need to use >> the same patch. If you ship -1.so.0 libraries then applications linked >> to the