Re: First 1.7.0 prerelease: June 1

2011-06-02 Thread Hyrum K Wright
On Wed, May 18, 2011 at 5:17 AM, Hyrum K Wright wrote: > Fire up your testing environments: they're going to get some use over > the next couple of months. > > In an effort to release early and often, I'd like to cut the first > 1.7.0 pre-release on June 1.  This will likely be a beta release, > s

Re: svn commit: r1130556 - in /subversion/tags/1.6.17: ./ subversion/include/svn_version.h

2011-06-02 Thread C. Michael Pilato
On 06/02/2011 04:49 PM, Hyrum K Wright wrote: > Done, with the last commit in r1130806. I approve. -- C. Michael Pilato CollabNet <> www.collab.net <> Distributed Development On Demand signature.asc Description: OpenPGP digital signature

Re: svn commit: r1130809 - /subversion/trunk/subversion/libsvn_client/patch.c

2011-06-02 Thread Stefan Sperling
On Thu, Jun 02, 2011 at 05:50:22PM -0400, Greg Stein wrote: > On Thu, Jun 2, 2011 at 16:56, wrote: > > Author: stsp > > Date: Thu Jun  2 20:56:58 2011 > > New Revision: 1130809 > > > > URL: http://svn.apache.org/viewvc?rev=1130809&view=rev > > Log: > > Remove use of stream mark/seek features from

Re: svn commit: r1130809 - /subversion/trunk/subversion/libsvn_client/patch.c

2011-06-02 Thread Greg Stein
On Thu, Jun 2, 2011 at 16:56, wrote: > Author: stsp > Date: Thu Jun  2 20:56:58 2011 > New Revision: 1130809 > > URL: http://svn.apache.org/viewvc?rev=1130809&view=rev > Log: > Remove use of stream mark/seek features from svn patch. Woah! I was just throwing out an idea... didn't mean for you to

Re: svn commit: r1130528 - in /subversion/trunk/subversion: libsvn_client/patch.c libsvn_repos/hooks.c libsvn_subr/mergeinfo.c libsvn_subr/subst.c libsvn_subr/utf.c libsvn_wc/props.c svn/util.c

2011-06-02 Thread Johan Corveleyn
On Thu, Jun 2, 2011 at 2:59 PM, wrote: > Author: stefan2 > Date: Thu Jun  2 12:59:59 2011 > New Revision: 1130528 > > URL: http://svn.apache.org/viewvc?rev=1130528&view=rev > Log: > Replace calls to svn_string_create_from_buf with the much cheaper > svn_string_create_from_buf. This is possible in

Re: svn commit: r1130118 - in /subversion/trunk/subversion: include/svn_io.h libsvn_subr/stream.c libsvn_subr/subst.c

2011-06-02 Thread Stefan Sperling
On Thu, Jun 02, 2011 at 10:59:15PM +0200, Stefan Sperling wrote: > I've ripped out mark/seek from the patch code in r1130809. I think we > could now remove mark and seek from the stream API before 1.7 release. Hmmm, stream.c:stream_readline_chunky() still requires mark/seek. I suppose we could mak

Re: svn commit: r1130118 - in /subversion/trunk/subversion: include/svn_io.h libsvn_subr/stream.c libsvn_subr/subst.c

2011-06-02 Thread Stefan Sperling
On Thu, Jun 02, 2011 at 04:05:49PM +0200, Stefan Sperling wrote: > On Thu, Jun 02, 2011 at 05:40:41PM +0400, Ivan Zhakov wrote: > > On Thu, Jun 2, 2011 at 17:36, Greg Stein wrote: > > > Well... note that the stream concept is used rather than apr_file_t > > > because "we may want to use something

Re: svn commit: r1130556 - in /subversion/tags/1.6.17: ./ subversion/include/svn_version.h

2011-06-02 Thread Hyrum K Wright
On Thu, Jun 2, 2011 at 3:17 PM, C. Michael Pilato wrote: > On 06/02/2011 04:11 PM, Hyrum K Wright wrote: >> On Thu, Jun 2, 2011 at 11:48 AM, C. Michael Pilato >> wrote: >>> On 06/02/2011 11:52 AM, Hyrum K Wright wrote: Mike, Thanks for picking up the pieces here.  A couple of thoughts:

Re: [serf-dev] Re: svn commit: r1124306 - /subversion/trunk/notes/meetings/berlin-11-agenda

2011-06-02 Thread Ivan Zhakov
On Fri, Jun 3, 2011 at 00:17, Greg Stein wrote: > On Thu, Jun 2, 2011 at 15:57, Ivan Zhakov wrote: >> On Wed, May 25, 2011 at 09:28, Justin Erenkrantz >> wrote: >>> On Tue, May 24, 2011 at 6:32 PM, Ivan Zhakov wrote: It's really hard reproduce problem, because it's related to timing of >>

Re: svn commit: r1130556 - in /subversion/tags/1.6.17: ./ subversion/include/svn_version.h

2011-06-02 Thread C. Michael Pilato
On 06/02/2011 04:11 PM, Hyrum K Wright wrote: > On Thu, Jun 2, 2011 at 11:48 AM, C. Michael Pilato > wrote: >> On 06/02/2011 11:52 AM, Hyrum K Wright wrote: >>> Mike, >>> Thanks for picking up the pieces here. A couple of thoughts: >>> * Since the magic rev for the release is r1128011, the tag

Re: [serf-dev] Re: svn commit: r1124306 - /subversion/trunk/notes/meetings/berlin-11-agenda

2011-06-02 Thread Greg Stein
On Thu, Jun 2, 2011 at 15:57, Ivan Zhakov wrote: > On Wed, May 25, 2011 at 09:28, Justin Erenkrantz > wrote: >> On Tue, May 24, 2011 at 6:32 PM, Ivan Zhakov wrote: >>> It's really hard reproduce problem, because it's related to timing of >>> sending and receiving requests. From the code my feel

Re: svn commit: r1130556 - in /subversion/tags/1.6.17: ./ subversion/include/svn_version.h

2011-06-02 Thread Hyrum K Wright
On Thu, Jun 2, 2011 at 11:48 AM, C. Michael Pilato wrote: > On 06/02/2011 11:52 AM, Hyrum K Wright wrote: >> Mike, >> Thanks for picking up the pieces here.  A couple of thoughts: >>  * Since the magic rev for the release is r1128011, the tag should be >> based on that revision, per HACKING (see [

Re: svn commit: r1130688 - in /subversion/trunk/subversion: libsvn_fs_base/tree.c libsvn_fs_fs/tree.c

2011-06-02 Thread C. Michael Pilato
On 06/02/2011 03:45 PM, Hyrum K Wright wrote: >> + if (err) >> +{ >> + if (err->apr_err == SVN_ERR_MERGEINFO_PARSE_ERROR) >> +svn_error_clear(err); >> + else >> +svn_error_return(err); > > This should be 'return svn_err

Re: [serf-dev] Re: svn commit: r1124306 - /subversion/trunk/notes/meetings/berlin-11-agenda

2011-06-02 Thread Ivan Zhakov
On Wed, May 25, 2011 at 09:28, Justin Erenkrantz wrote: > On Tue, May 24, 2011 at 6:32 PM, Ivan Zhakov wrote: >> It's really hard reproduce problem, because it's related to timing of >> sending and receiving requests. From the code my feeling that issue is >> still exists, just in more complicate

Re: svn commit: r1130688 - in /subversion/trunk/subversion: libsvn_fs_base/tree.c libsvn_fs_fs/tree.c

2011-06-02 Thread Hyrum K Wright
On Thu, Jun 2, 2011 at 12:49 PM, wrote: > Author: pburba > Date: Thu Jun  2 17:49:36 2011 > New Revision: 1130688 > > URL: http://svn.apache.org/viewvc?rev=1130688&view=rev > Log: > A partial fix for issue #3896 'mergeinfo syntax errors should be treated > gracefully': Tolerate invalid mergeinfo

Re: [PATCH] Unlocking a file and pre-unlock hook failure

2011-06-02 Thread vijay
On Thursday 02 June 2011 08:36 PM, Daniel Shahaf wrote: +#-- +def block_unlock_if_pre_unlock_hook_fails(sbox): + "block unlock operation if pre-unlock hook fails" + + sbox.build() + wc_dir = sbox.wc_dir + repo_dir = sbox.rep

Re: [PATCH] Don't create an unnecessary index

2011-06-02 Thread Philip Martin
Daniel Shahaf writes: > I'm also attaching the results of 'sqlite3 EXPLAIN INSERT' on > revprops.db, with the index as created by default and then without > the index. And "EXPLAIN SELECT" shows that the select is unchanged. -- Philip

[PATCH] Don't create an unnecessary index

2011-06-02 Thread Daniel Shahaf
[[[ * subversion/libsvn_fs_fs/revprops-db.sql (i_revision): Drop this index as redundant and overhead-inducing, since the UNIQUE directive already creates (another) index. Found by: philip ]]] [[[ Index: subversion/libsvn_fs_fs/revprops-db.sql ==

[PATCH] possible improvement to svn log with "forward" revision range (issue 3830)

2011-06-02 Thread Dirk Thomas
Could someone of the devs please take a closer look? I am willing to improve the patch based on concrete suggestions. [...] Sure thing. I can see where you're going with the patch. I haven't taken the time to fully consider the appropriate, so consider the following a syntactical patch review

Re: svn commit: r1130637 - in /subversion/trunk/subversion/libsvn_wc: wc-queries.sql wc_db.c

2011-06-02 Thread Philip Martin
Greg Stein writes: > On Thu, Jun 2, 2011 at 12:32, wrote: >>... >> +++ subversion/trunk/subversion/libsvn_wc/wc-queries.sql Thu Jun  2 16:32:18 >> 2011 >> @@ -726,6 +726,10 @@ VALUES (?1, ?2, ?3) >>  SELECT locked_levels FROM wc_lock >>  WHERE wc_id = ?1 AND local_dir_relpath = ?2 >> >> +-- ST

Re: svn commit: r1130637 - in /subversion/trunk/subversion/libsvn_wc: wc-queries.sql wc_db.c

2011-06-02 Thread Greg Stein
On Thu, Jun 2, 2011 at 12:32, wrote: >... > +++ subversion/trunk/subversion/libsvn_wc/wc-queries.sql Thu Jun  2 16:32:18 > 2011 > @@ -726,6 +726,10 @@ VALUES (?1, ?2, ?3) >  SELECT locked_levels FROM wc_lock >  WHERE wc_id = ?1 AND local_dir_relpath = ?2 > > +-- STMT_COUNT_WC_LOCK > +SELECT COUN

Re: svn commit: r1130556 - in /subversion/tags/1.6.17: ./ subversion/include/svn_version.h

2011-06-02 Thread C. Michael Pilato
On 06/02/2011 11:52 AM, Hyrum K Wright wrote: > Mike, > Thanks for picking up the pieces here. A couple of thoughts: > * Since the magic rev for the release is r1128011, the tag should be > based on that revision, per HACKING (see [1]) > * From that point, we should then merge to the tag the rel

[PATCH] svnmerge-migrate-history-remotely.py: move from getopt to optparse

2011-06-02 Thread anatoly techtonik
Attached patch fixes svnmerge history conversion script to use optparse library instead of getopt. This allows further addition of new options, such as --username and --password. Please, CC -- anatoly t. [[[ Switch svnmerge history conversion script from getopt to optparse library. * contrib/cli

Re: svn commit: r1103490 - /subversion/trunk/subversion/libsvn_ra_svn/marshal.c

2011-06-02 Thread Stefan Fuhrmann
On 20.05.2011 12:38, Philip Martin wrote: Stefan Fuhrmann writes: On 15.05.2011 20:23, Blair Zajac wrote: On May 15, 2011, at 11:06 AM, stef...@apache.org wrote: item->kind = SVN_RA_SVN_STRING; - item->u.string = apr_palloc(pool, sizeof(*item->u.string)); - item->u.string->data = strin

Re: svn commit: r1130556 - in /subversion/tags/1.6.17: ./ subversion/include/svn_version.h

2011-06-02 Thread Hyrum K Wright
Mike, Thanks for picking up the pieces here. A couple of thoughts: * Since the magic rev for the release is r1128011, the tag should be based on that revision, per HACKING (see [1]) * From that point, we should then merge to the tag the relavant revisions from 1.6.x to make the tag match the rel

Re: svn commit: r1103578 - in /subversion/trunk/subversion: include/svn_wc.h libsvn_client/update.c libsvn_wc/deprecated.c libsvn_wc/update_editor.c

2011-06-02 Thread Stefan Fuhrmann
On 17.05.2011 17:22, Daniel Shahaf wrote: Stefan Fuhrmann wrote on Tue, May 17, 2011 at 17:01:03 +0200: On 17.05.2011 09:51, Daniel Shahaf wrote: stef...@apache.org wrote on Mon, May 16, 2011 at 00:02:06 -: Author: stefan2 Date: Mon May 16 00:02:05 2011 New Revision: 1103578 URL: http://s

Re: [PATCH] Unlocking a file and pre-unlock hook failure

2011-06-02 Thread Daniel Shahaf
vijay wrote on Thu, Jun 02, 2011 at 20:18:22 +0530: > On Thursday 02 June 2011 05:05 PM, Philip Martin wrote: > >vijay writes: > > > >>At the end of the testcase, I thought of checking the status of the > >>working copy with expected status as "writelocked=K". But I couldn't > >>do it as the test

Re: [PATCH] Unlocking a file and pre-unlock hook failure

2011-06-02 Thread vijay
On Thursday 02 June 2011 05:05 PM, Philip Martin wrote: vijay writes: At the end of the testcase, I thought of checking the status of the working copy with expected status as "writelocked=K". But I couldn't do it as the test raises exception in between, i.e., during unlock operation itself. I

Re: svn commit: r1129980 - /subversion/trunk/notes/knobs

2011-06-02 Thread Stefan Fuhrmann
On 02.06.2011 11:22, Daniel Shahaf wrote: Julian Foad wrote on Thu, Jun 02, 2011 at 09:37:05 +0100: On Wed, 2011-06-01 at 23:42 +0200, Stefan Fuhrmann wrote: On 01.06.2011 16:28, Daniel Shahaf wrote: Greg Stein wrote on Wed, Jun 01, 2011 at 10:22:51 -0400: On Jun 1, 2011 10:09 AM, "Stefan Spe

Re: svn commit: r1130118 - in /subversion/trunk/subversion: include/svn_io.h libsvn_subr/stream.c libsvn_subr/subst.c

2011-06-02 Thread Stefan Sperling
On Thu, Jun 02, 2011 at 05:40:41PM +0400, Ivan Zhakov wrote: > On Thu, Jun 2, 2011 at 17:36, Greg Stein wrote: > > Well... note that the stream concept is used rather than apr_file_t > > because "we may want to use something besides a file, in the future". > > IOW, these extra APIs are for unprove

Re: svn commit: r1130118 - in /subversion/trunk/subversion: include/svn_io.h libsvn_subr/stream.c libsvn_subr/subst.c

2011-06-02 Thread Ivan Zhakov
On Thu, Jun 2, 2011 at 17:36, Greg Stein wrote: > On Thu, Jun 2, 2011 at 09:30, Julian Foad wrote: >> On Wed, 2011-06-01 at 17:29 +0200, Stefan Sperling wrote: >>> On Wed, Jun 01, 2011 at 11:15:16AM -0400, Greg Stein wrote: >>> > The "few" that I was talking about were the "skip" and "mark" >>> >

Re: svn commit: r1033760 - /subversion/trunk/subversion/svn/util.c

2011-06-02 Thread Julian Foad
On Thu, 2011-06-02, Greg Stein wrote: > 2011/6/2 Branko Čibej : > > On 02.06.2011 01:05, Stefan Sperling wrote: > >> On Wed, Jun 01, 2011 at 07:01:10PM -0400, Greg Stein wrote: > >>> Really? > >> I know you don't like Douglas Adam's work, but some people do :) > >> If you feel strongly about it fee

Re: svn commit: r1130118 - in /subversion/trunk/subversion: include/svn_io.h libsvn_subr/stream.c libsvn_subr/subst.c

2011-06-02 Thread Greg Stein
On Thu, Jun 2, 2011 at 09:30, Julian Foad wrote: > On Wed, 2011-06-01 at 17:29 +0200, Stefan Sperling wrote: >> On Wed, Jun 01, 2011 at 11:15:16AM -0400, Greg Stein wrote: >> > The "few" that I was talking about were the "skip" and "mark" >> > concepts, too. Those seem to be very specialized, and

Re: svn commit: r1072519 - Add svn_stream_skip(), svn_stream_buffered(), svn_stream_supports_mark()

2011-06-02 Thread Julian Foad
On Thu, 2011-06-02 at 14:32 +0300, Daniel Shahaf wrote: > Stefan Fuhrmann wrote on Thu, Jun 02, 2011 at 00:08:16 +0200: > > On 01.06.2011 16:08, Julian Foad wrote: > > >On Sun, 2011-02-20, stef...@apache.org wrote: > > >>Merge all changes (r1068695 - r1072516) from the > > >>integrate-stream-api-ex

Re: svn commit: r1130118 - in /subversion/trunk/subversion: include/svn_io.h libsvn_subr/stream.c libsvn_subr/subst.c

2011-06-02 Thread Julian Foad
On Wed, 2011-06-01 at 17:29 +0200, Stefan Sperling wrote: > On Wed, Jun 01, 2011 at 11:15:16AM -0400, Greg Stein wrote: > > The "few" that I was talking about were the "skip" and "mark" > > concepts, too. Those seem to be very specialized, and maybe only used > > by the "patch" code? Oh, right. >

Re: svn commit: r1130512 - in /subversion/trunk/subversion: include/svn_string.h libsvn_subr/svn_string.c

2011-06-02 Thread Greg Stein
On Thu, Jun 2, 2011 at 08:24, wrote: >... > +++ subversion/trunk/subversion/libsvn_subr/svn_string.c Thu Jun  2 12:24:36 > 2011 > @@ -235,9 +235,16 @@ svn_string_find_char_backward(const svn_ >   return find_char_backward(str->data, str->len, ch); >  } > > -const svn_string_t * > -svn_string_fro

Re: svn commit: r1033760 - /subversion/trunk/subversion/svn/util.c

2011-06-02 Thread Greg Stein
2011/6/2 Branko Čibej : > On 02.06.2011 01:05, Stefan Sperling wrote: >> On Wed, Jun 01, 2011 at 07:01:10PM -0400, Greg Stein wrote: >>> Really? >> I know you don't like Douglas Adam's work, but some people do :) >> If you feel strongly about it feel free to revert it. > > I don't think this is abo

Re: svn commit: r1130512 - in /subversion/trunk/subversion: include/svn_string.h libsvn_subr/svn_string.c

2011-06-02 Thread Philip Martin
stef...@apache.org writes: > Author: stefan2 > Date: Thu Jun 2 12:24:36 2011 > New Revision: 1130512 > + * member in svn_stringbuf_t, any attempt to re-size the returned > + * svn_string_t might invalidate the STRBUF struct. Hence, we consider > + * the source STRBUF "consumed". > + * >

Re: svn commit: r1033760 - /subversion/trunk/subversion/svn/util.c

2011-06-02 Thread Branko Čibej
On 02.06.2011 01:05, Stefan Sperling wrote: > On Wed, Jun 01, 2011 at 07:01:10PM -0400, Greg Stein wrote: >> Really? > I know you don't like Douglas Adam's work, but some people do :) > If you feel strongly about it feel free to revert it. I don't think this is about liking or not liking. What I w

Odd conflict

2011-06-02 Thread Daniel Shahaf
BASE file: [[[ void svn_stream_set_buffered(svn_stream_t *stream, svn_io_is_buffered_fn_t is_buffered_fn) { stream->buffered_fn = buffered_fn; } ]]] WORKING file: [[[ void svn_stream_set_buffered(svn_stream_t *stream, svn_io_is_buffered_fn_t is_buf

Re: [PATCH] Unlocking a file and pre-unlock hook failure

2011-06-02 Thread Philip Martin
vijay writes: > At the end of the testcase, I thought of checking the status of the > working copy with expected status as "writelocked=K". But I couldn't > do it as the test raises exception in between, i.e., during unlock > operation itself. I don't understand this. With your patch the test i

Re: svn commit: r1072519 - Add svn_stream_skip(), svn_stream_buffered(), svn_stream_supports_mark()

2011-06-02 Thread Daniel Shahaf
Stefan Fuhrmann wrote on Thu, Jun 02, 2011 at 00:08:16 +0200: > On 01.06.2011 16:08, Julian Foad wrote: > >On Sun, 2011-02-20, stef...@apache.org wrote: > >>Merge all changes (r1068695 - r1072516) from the > >>integrate-stream-api-extensions. > >> > >>These patches add svn_stream_skip(), svn_stream

Re: svn commit: r1072519 - Add svn_stream_skip(), svn_stream_buffered(), svn_stream_supports_mark()

2011-06-02 Thread Julian Foad
On Thu, 2011-06-02, Stefan Fuhrmann wrote: > On 01.06.2011 16:40, Julian Foad wrote: > >> static svn_error_t * > >> skip_handler_apr(void *baton, apr_size_t *count) > >> { > >>struct baton_apr *btn = baton; > >>apr_off_t offset = *count; > >>apr_off_t new_pos = *count; > >>apr_off_t

Re: svn commit: r1072519 - Add svn_stream_skip(), svn_stream_buffered(), svn_stream_supports_mark()

2011-06-02 Thread Julian Foad
On Thu, 2011-06-02 at 11:49 +0100, Julian Foad wrote: > On Thu, 2011-06-02, Stefan Fuhrmann wrote: > > On 01.06.2011 17:06, Julian Foad wrote: > > >> svn_error_t * > > >> svn_stream_skip(svn_stream_t *stream, apr_size_t *len) > > >> { > > >>SVN_ERR_ASSERT(stream->skip_fn != NULL); > > > This sh

Re: svn commit: r1072519 - Add svn_stream_skip(), svn_stream_buffered(), svn_stream_supports_mark()

2011-06-02 Thread Julian Foad
On Thu, 2011-06-02, Stefan Fuhrmann wrote: > On 01.06.2011 17:06, Julian Foad wrote: > >> svn_error_t * > >> svn_stream_skip(svn_stream_t *stream, apr_size_t *len) > >> { > >>SVN_ERR_ASSERT(stream->skip_fn != NULL); > > This should call the default skip implementation (which reads and > > disca

Re: svn commit: r1129980 - /subversion/trunk/notes/knobs

2011-06-02 Thread Daniel Shahaf
Julian Foad wrote on Thu, Jun 02, 2011 at 09:37:05 +0100: > On Wed, 2011-06-01 at 23:42 +0200, Stefan Fuhrmann wrote: > > On 01.06.2011 16:28, Daniel Shahaf wrote: > > > Greg Stein wrote on Wed, Jun 01, 2011 at 10:22:51 -0400: > > >> On Jun 1, 2011 10:09 AM, "Stefan Sperling" wrote: > > >>> On Wed

Re: svn commit: r1129980 - /subversion/trunk/notes/knobs

2011-06-02 Thread Julian Foad
On Wed, 2011-06-01 at 23:42 +0200, Stefan Fuhrmann wrote: > On 01.06.2011 16:28, Daniel Shahaf wrote: > > Greg Stein wrote on Wed, Jun 01, 2011 at 10:22:51 -0400: > >> On Jun 1, 2011 10:09 AM, "Stefan Sperling" wrote: > >>> On Wed, Jun 01, 2011 at 09:57:24AM -0400, Greg Stein wrote: > I had a

Re: buildbot failure in ASF Buildbot on svn-x64-centos-gcc

2011-06-02 Thread Julian Foad
On Wed, 2011-06-01, Greg Stein wrote: > Hrm. I'm on the blamelist, but I only changed param names in a header. > > The failing tests is "basic 54: basic relocate of a wc". The log seems > to show a timeout talking to the server. > > Any thoughts? I can only say "unexplained one-off event". I ch