Re: problems with merging

2013-01-29 Thread Julian Foad
Stefan Küng wrote on 2013-01-27: > using a build from the svn trunk (as of r1439016), I've discovered a few > problems when merging. > > svn co -r23862 https://tortoisesvn.googlecode.com/svn/branches/1.7.x/src > tsvnsrc > cd tsvnsrc > > Now for the merge: > svn merge -c23846,23862 https://tort

Re: packages tree

2013-01-29 Thread Blair Zajac
On 01/29/2013 10:04 AM, Ben Reser wrote: Should we remove the packages tree? The packages are almost certainly terribly out of date. There's been 1 functional commit (not including things like URL and license changes from the ASF changeover) since 2009. To give an example the RedHat rpm packag

Re: packages tree

2013-01-29 Thread Hyrum K Wright
On Tue, Jan 29, 2013 at 6:41 PM, Justin Erenkrantz wrote: > On Tue, Jan 29, 2013 at 1:04 PM, Ben Reser wrote: > >> If we're not going to keep these things up to date then I think we >> should just remove them. >> > > +1 to remove. (It's all version-controlled anyway!) -- justin +1

FOSDEM 2013

2013-01-29 Thread Justin Erenkrantz
FWIW, I'll be at FOSDEM in Brussels this weekend (arriving on Friday morning) - if any other SVN devs are going to be there, it'd be fun to catch up. Cheers. -- justin

Re: [RFC] Run the conflict resolver callback per file during merge - issue #4238

2013-01-29 Thread Julian Foad
I (Julian Foad) wrote on 2012-01-25: > Stefan Sperling wrote: >> I filed the issue. I think I had in mind that we'd store multiple >> conflicts, but I'm not quite sure. >> >> I agree with your plans to deal with the non-interactive --accept case. In r1440193 I did that, closing issue #4238.

Re: packages tree

2013-01-29 Thread Justin Erenkrantz
On Tue, Jan 29, 2013 at 1:04 PM, Ben Reser wrote: > If we're not going to keep these things up to date then I think we > should just remove them. > +1 to remove. (It's all version-controlled anyway!) -- justin

Re: packages tree

2013-01-29 Thread Ben Reser
On Tue, Jan 29, 2013 at 2:04 PM, Greg Stein wrote: > Right. I think we went thru this a while back. > > +1 to toss. I couldn't find it and I'm pretty sure we did it on IRC. So I sent the email with the intent of allowing everyone to respond. Given the feedback so far, unless someone has a real

Re: packages tree

2013-01-29 Thread Greg Stein
On Jan 29, 2013 4:54 PM, "Stefan Sperling" wrote: > > On Tue, Jan 29, 2013 at 10:04:36AM -0800, Ben Reser wrote: > > Should we remove the packages tree? > > Yes, please. I remember suggesting to remove it before. +1 Right. I think we went thru this a while back. +1 to toss.

Re: packages tree

2013-01-29 Thread Stefan Sperling
On Tue, Jan 29, 2013 at 10:04:36AM -0800, Ben Reser wrote: > Should we remove the packages tree? Yes, please. I remember suggesting to remove it before. +1

Re: svn commit: r1440047 - /subversion/trunk/subversion/tests/libsvn_repos/repos-test.c

2013-01-29 Thread Ben Reser
On Tue, Jan 29, 2013 at 10:40 AM, Bert Huijben wrote: > I think there might be third party implementations (CollabNet, WANdisco, > VisualSvn) that might rely on these values? > > So maybe somebody wants to respond? > > > Personally I would prefer to see an error somewhere in SVN_ERR_AUTHZ to at

Re: Unsafe WC DB calls: sqlite_column_text(..., pool=NULL)

2013-01-29 Thread Julian Foad
Bert Huijben wrote: > Bert Huijben wrote: >> Julian Foad wrote: >>> I noticed code like this in wc_db.c: >>> >>>   const char *relpath = svn_sqlite__column_text(stmt, 0, NULL); >>>   svn_kind_t kind = svn_sqlite__column_token(stmt, 1, kind_map); >>> >>> According to the docs [1], the second _column

RE: svn commit: r1440047 - /subversion/trunk/subversion/tests/libsvn_repos/repos-test.c

2013-01-29 Thread Bert Huijben
> -Original Message- > From: bre...@apache.org [mailto:bre...@apache.org] > Sent: dinsdag 29 januari 2013 19:28 > To: comm...@subversion.apache.org > Subject: svn commit: r1440047 - > /subversion/trunk/subversion/tests/libsvn_repos/repos-test.c > > Author: breser > Date: Tue Jan 29 18:27:5

Re: [PATCH] OPW 2013: Build System Gtest Addition

2013-01-29 Thread Ben Reser
On Tue, Jan 29, 2013 at 9:37 AM, Gabriela Gibson wrote: > Please see the attachment for a long long list of questions :) Would have been easier for me to look at this if you'd just have included it inline in the email or at least as a text/plain attachment (your mailer seems to have decided it wa

Re: packages tree

2013-01-29 Thread C. Michael Pilato
On 01/29/2013 01:04 PM, Ben Reser wrote: > Should we remove the packages tree? The packages are almost certainly > terribly out of date. There's been 1 functional commit (not including > things like URL and license changes from the ASF changeover) since > 2009. [...] > If we're not going to kee

packages tree

2013-01-29 Thread Ben Reser
Should we remove the packages tree? The packages are almost certainly terribly out of date. There's been 1 functional commit (not including things like URL and license changes from the ASF changeover) since 2009. To give an example the RedHat rpm packages don't have a rhel-6 package, the documen

RE: Unsafe WC DB calls: sqlite_column_text(..., pool=NULL)

2013-01-29 Thread Bert Huijben
> -Original Message- > From: Bert Huijben [mailto:b...@qqmail.nl] > Sent: dinsdag 29 januari 2013 18:35 > To: 'Julian Foad'; 'Subversion Development' > Subject: RE: Unsafe WC DB calls: sqlite_column_text(..., pool=NULL) > > > > > -Original Message- > > From: Julian Foad [mailto

Re: [PATCH] OPW 2013: Build System Gtest Addition

2013-01-29 Thread Gabriela Gibson
On 22/01/13 11:15, Gabriela Gibson wrote: Part of my 2013 OPW Project for Subversion is to add the Googletest test suite to be compiled by the build system. Please see the attachment for a long long list of questions :) gtestquestions1 Description: application/shellscript

RE: Unsafe WC DB calls: sqlite_column_text(..., pool=NULL)

2013-01-29 Thread Bert Huijben
> -Original Message- > From: Julian Foad [mailto:julianf...@btopenworld.com] > Sent: dinsdag 29 januari 2013 17:15 > To: Subversion Development > Subject: Unsafe WC DB calls: sqlite_column_text(..., pool=NULL) > > I noticed code like this in wc_db.c: > >   const char *relpath = svn_sqli

Re: [PATCH] Add tests for the "svnauthz --groups-file" behavior

2013-01-29 Thread Ben Reser
On Tue, Jan 29, 2013 at 5:43 AM, Evgeny Kotkov wrote: > Since r1438206 [1] there is a way to write blackbox tests for the 'svnauthz' > tool (via svnauthz_tests.py). > > So, this patch is a follow-up to r1438407 [2], which adds two tests for the > "svnauthz --groups-file" behavior. > > [1] https://

Unsafe WC DB calls: sqlite_column_text(..., pool=NULL)

2013-01-29 Thread Julian Foad
I noticed code like this in wc_db.c:   const char *relpath = svn_sqlite__column_text(stmt, 0, NULL);   svn_kind_t kind = svn_sqlite__column_token(stmt, 1, kind_map); According to the docs [1], the second _column_*() call can overwrite the value returned by the first one, since we passed NULL as

[PATCH] Add tests for the "svnauthz --groups-file" behavior

2013-01-29 Thread Evgeny Kotkov
Hi, Since r1438206 [1] there is a way to write blackbox tests for the 'svnauthz' tool (via svnauthz_tests.py). So, this patch is a follow-up to r1438407 [2], which adds two tests for the "svnauthz --groups-file" behavior. [1] https://svn.apache.org/viewvc?view=revision&revision=r1438206 [2] http