memory pool problem in merge

2011-11-18 Thread Philip Martin
valgrind is giving "invalid read" during merge_tree_conflict_tests.py test 22 at line 1735. valgrind -q ../../svn/.libs/lt-svn merge file:///home/pm/sw/subversion/obj/subversion/tests/cmdline/svn-test-work/repositories/merge_tree_conflict_tests-22/A file:///home/pm/sw/subversion/obj/subversion/

Re: svn commit: r1203687 - /subversion/trunk/subversion/svn/status.c

2011-11-18 Thread Daniel Shahaf
On Friday, November 18, 2011 10:36 AM, "C. Michael Pilato" wrote: > On 11/18/2011 10:26 AM, Daniel Shahaf wrote: > > If we add a status->foo flag (like we added the status->changelist bit > > in 1.4), we would have to explicitly add it to this if() too --- which is > > too easy to forget. > > Do

Re: svn commit: r1203687 - /subversion/trunk/subversion/svn/status.c

2011-11-18 Thread C. Michael Pilato
On 11/18/2011 10:26 AM, Daniel Shahaf wrote: > If we add a status->foo flag (like we added the status->changelist bit > in 1.4), we would have to explicitly add it to this if() too --- which is > too easy to forget. Do you have a concrete suggestion for making this future-proof? If not, we'll sim

Re: svn commit: r1203687 - /subversion/trunk/subversion/svn/status.c

2011-11-18 Thread Daniel Shahaf
On Friday, November 18, 2011 3:12 PM, cmpil...@apache.org wrote: > Author: cmpilato > Date: Fri Nov 18 15:12:03 2011 > New Revision: 1203687 > > URL: http://svn.apache.org/viewvc?rev=1203687&view=rev > Log: > For issue #1935 ("svn status too verbose with svn:externals > definitions"), continue t

Re: svn commit: r1203234 - /subversion/trunk/subversion/svn/status.c

2011-11-18 Thread C. Michael Pilato
On 11/18/2011 04:20 AM, Bert Huijben wrote: > This also hides file externals that have their properties changed and maybe a > few other states. I. HATE. FILE EXTERNALS. I've added some more logic to the filter (see r1203687 and r1203690). Please modify as you see the need, or continue flaggin

RE: problems with mimetype of and empty utf8 files in svn 1.7

2011-11-18 Thread Schmied, Fabian
> > Is it okay to create an issue in > > the issue tracker that we could watch? > > Absolutely. You can assign this issue to me, set the milestone to 1.7.x, and > I'll > deal with it when I find time. Thank you. Here it is: "http://subversion.tigris.org/issues/show_bug.cgi?id=4064";. Thanks, Fa

Re: svn commit: r1203546 - /subversion/trunk/subversion/mod_dav_svn/mod_dav_svn.c

2011-11-18 Thread Stefan Sperling
On Fri, Nov 18, 2011 at 03:07:11PM +0100, Stefan Sperling wrote: > On Fri, Nov 18, 2011 at 02:52:44PM +0100, Stefan Sperling wrote: > > Suggestion (not tested); > > > > ap_log_error(APLOG_MARK, APLOG_WARNING, 0, NULL, > >"mod_dav_svn: nested Location '%s' inside " > >

Re: svn commit: r1203546 - /subversion/trunk/subversion/mod_dav_svn/mod_dav_svn.c

2011-11-18 Thread Stefan Sperling
On Fri, Nov 18, 2011 at 02:52:44PM +0100, Stefan Sperling wrote: > Suggestion (not tested); > > ap_log_error(APLOG_MARK, APLOG_WARNING, 0, NULL, >"mod_dav_svn: nested Location '%s' inside " >"SVNPath Location '%s'; this hinders access to a file " >

Re: Use svn_sort__array_delete() instead of a copying loop - not working

2011-11-18 Thread Julian Foad
I (Julian Foad) wrote: > Why doesn't this patch work as I expect?  [...] OK I've found the problem.  It's these lines in do_directory_merge():   svn_merge_range_t *first_target_range = APR_ARRAY_IDX(     target_merge_path->remaining_ranges, 0, svn_merge_range_t *);   if (first_target

Re: svn commit: r1203546 - /subversion/trunk/subversion/mod_dav_svn/mod_dav_svn.c

2011-11-18 Thread Stefan Sperling
On Fri, Nov 18, 2011 at 01:37:24PM +, Philip Martin wrote: > phi...@apache.org writes: > > > Author: philip > > Date: Fri Nov 18 09:09:56 2011 > > New Revision: 1203546 > > > Also, a nested Location inside an SVNPath Location is ambiguous so > > prevent access and log the problem. > > > + i

Re: svn commit: r1203546 - /subversion/trunk/subversion/mod_dav_svn/mod_dav_svn.c

2011-11-18 Thread Philip Martin
phi...@apache.org writes: > Author: philip > Date: Fri Nov 18 09:09:56 2011 > New Revision: 1203546 > Also, a nested Location inside an SVNPath Location is ambiguous so > prevent access and log the problem. > + if (parent->fs_path) > +{ > + /* Nesting inside SVNPath is ambiguous so pre

Re: problems with mimetype of and empty utf8 files in svn 1.7

2011-11-18 Thread Stefan Sperling
On Fri, Nov 18, 2011 at 11:18:55AM +, Schmied, Fabian wrote: > Sorry for jumping in; but since we're affected by this issue, too, I > just want to ask: Is this now planned to be changed (fixed) for one of > the upcoming releases of Subversion? Yes. It just fell through the cracks. Thanks for p

Re: svn commit: r1203344 - /subversion/trunk/subversion/libsvn_delta/compat.c

2011-11-18 Thread Greg Stein
On Fri, Nov 18, 2011 at 04:05, Bert Huijben wrote: >> -Original Message- >> From: hwri...@apache.org [mailto:hwri...@apache.org] >> Sent: donderdag 17 november 2011 20:37 >> To: comm...@subversion.apache.org >> Subject: svn commit: r1203344 - >> /subversion/trunk/subversion/libsvn_delta/co

Re: problems with mimetype of and empty utf8 files in svn 1.7

2011-11-18 Thread Schmied, Fabian
> > Have you considered patchign svn_io_is_binary_data()? > > > > (which, it appears, will be functionally equivalent to your current > > patch) > > > Yeah, makes sense. Do that if you prefer. > (regarding Bert's patch problem: looks like a bug to me, too) Sorry for jumping in; but since w

RE: svn commit: r1203234 - /subversion/trunk/subversion/svn/status.c

2011-11-18 Thread Bert Huijben
> -Original Message- > From: cmpil...@apache.org [mailto:cmpil...@apache.org] > Sent: donderdag 17 november 2011 17:12 > To: comm...@subversion.apache.org > Subject: svn commit: r1203234 - /subversion/trunk/subversion/svn/status.c > > Author: cmpilato > Date: Thu Nov 17 16:12:04 2011 > N

RE: svn commit: r1203344 - /subversion/trunk/subversion/libsvn_delta/compat.c

2011-11-18 Thread Bert Huijben
> -Original Message- > From: hwri...@apache.org [mailto:hwri...@apache.org] > Sent: donderdag 17 november 2011 20:37 > To: comm...@subversion.apache.org > Subject: svn commit: r1203344 - > /subversion/trunk/subversion/libsvn_delta/compat.c > > Author: hwright > Date: Thu Nov 17 19:37:29