Re: Coloured output from our Python tests

2013-01-25 Thread Ben Reser
On Thu, Jan 24, 2013 at 8:51 AM, Julian Foad wrote: > To make debugging the output of Subversion tests more of a pleasure, I use > the "Generic Colourizer" utility "grc" [1], with a simple configuration [2]. > > The result is that I can run Subversion tests like this: > > $ grc .../merge_tests.

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

2013-01-25 Thread Paul Burba
On Fri, Jan 25, 2013 at 12:32 PM, Paul Burba wrote: > On Fri, Jan 25, 2013 at 12:11 PM, Paul Burba wrote: >> On Thu, Jan 24, 2013 at 5:16 PM, Julian Foad >> wrote: >>> Summary: I plan to make 'svn merge' act on --accept=theirs|mine|etc. per >>> file, rather than (as it does now) postponing all

Re: [PATCH] Re: Community-guide: outdated svn-breakage web page advice on building.html

2013-01-25 Thread Stefan Sperling
On Fri, Jan 25, 2013 at 03:19:00PM +, Gabriela Gibson wrote: > On 25/01/13 13:44, Stefan Sperling wrote: > > If you'd like to receive notifications about > > Thank you, patch is attached. Thanks! Committed with tweaks in r1438625. I've additionally moved the buildbot advice into the sectio

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

2013-01-25 Thread Paul Burba
On Fri, Jan 25, 2013 at 12:11 PM, Paul Burba wrote: > On Thu, Jan 24, 2013 at 5:16 PM, Julian Foad > wrote: >> Summary: I plan to make 'svn merge' act on --accept=theirs|mine|etc. per >> file, rather than (as it does now) postponing all conflicts until after the >> whole merge and then resolvi

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

2013-01-25 Thread Paul Burba
On Thu, Jan 24, 2013 at 5:16 PM, Julian Foad wrote: > Summary: I plan to make 'svn merge' act on --accept=theirs|mine|etc. per > file, rather than (as it does now) postponing all conflicts until after the > whole merge and then resolving them. > > > I have been investigating the way "--accept=fo

[PATCH] Re: Community-guide: outdated svn-breakage web page advice on building.html

2013-01-25 Thread Gabriela Gibson
On 25/01/13 13:44, Stefan Sperling wrote: If you'd like to receive notifications about Thank you, patch is attached. Index: publish/docs/community-guide/building.part.html === --- publish/docs/community-guide/building.part.html

New svn_diff_tree_processor_t API

2013-01-25 Thread Julian Foad
Hi Bert.  I see you added a new svn_diff_tree_processor_t API as a replacement for svn_wc_diff_callbacks.  We certainly needed a replacement.  Could you tell us about it?  What are its properties that make it superior? - Julian -- Certified & Supported Apache Subversion Downloads: http://www.

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

2013-01-25 Thread Julian Foad
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. > > I have one concern about the interactive case where no --accept option > was passed, whi

Re: Community-guide: outdated svn-breakage web page advice on building.html

2013-01-25 Thread Stefan Sperling
On Fri, Jan 25, 2013 at 01:04:52PM +, Gabriela Gibson wrote: > The following section > > http://subversion.apache.org/docs/community-guide/building.html#automated-tests > > is still pointing to the removed svntest directory: > > /trunk/tools/test-scripts/svntest/ here: > > "If you'd like t

Community-guide: outdated svn-breakage web page advice on building.html

2013-01-25 Thread Gabriela Gibson
The following section http://subversion.apache.org/docs/community-guide/building.html#automated-tests is still pointing to the removed svntest directory: /trunk/tools/test-scripts/svntest/ here: "If you'd like to send svn-breakage messages too, use the svntest framework (start at the README).

Re: [PATCH] Introduce AuthzSVNGroupsFile configuration option for mod_authz_svn

2013-01-25 Thread Daniel Shahaf
Philip Martin wrote on Fri, Jan 25, 2013 at 10:30:00 +: > I suppose this approach would break the meaning of existing authz files > already using '[inherit]'. Another approach would be to use some > non-INI syntax to define include files. That's not a problem. 'inherit' is not "groups" or "

Re: svn commit: r1438270 - in /subversion/trunk/subversion/libsvn_client: merge.c repos_diff.c

2013-01-25 Thread Philip Martin
rhuij...@apache.org writes: > Author: rhuijben > Date: Thu Jan 24 23:52:07 2013 > New Revision: 1438270 > +static svn_error_t * > +diff_state_handle(svn_boolean_t tree_conflicted, > + svn_wc_notify_state_t *state, > + svn_wc_notify_state_t *prop_state, > +

Re: [PATCH] Introduce AuthzSVNGroupsFile configuration option for mod_authz_svn

2013-01-25 Thread Philip Martin
Ivan Zhakov writes: > On Wed, Jan 23, 2013 at 7:27 PM, Evgeny Kotkov > wrote: >> When AuthzSVNReposRelativeAccessFile directive is being used and >> authorization rules are stored per-repository, it is usually required to >> have a single set of groups for all repositories. >> >> In other words,

Re: [PATCH] Introduce AuthzSVNGroupsFile configuration option for mod_authz_svn

2013-01-25 Thread Ivan Zhakov
On Wed, Jan 23, 2013 at 7:27 PM, Evgeny Kotkov wrote: > When AuthzSVNReposRelativeAccessFile directive is being used and > authorization rules are stored per-repository, it is usually required to > have a single set of groups for all repositories. > > In other words, there can be a 'developers' gr

Re: [PATCH] make mergeinfo diagram column headings l10n friendly

2013-01-25 Thread Andreas Stieger
On 24/01/13 22:40, Julian Foad wrote: > Reviewed. +1. The best thing is this patch will make it much easier > to teach the code to adapt automatically to different column widths. r1438400 Andreas

Re: [PATCH] Support regex in EXPECTED ERR list

2013-01-25 Thread Ben Reser
On Fri, Jan 25, 2013 at 12:00 AM, Ben Reser wrote: > So we're talking about wanting a way to want to use a list of regexes > that are still ordered. The logical thing to do would be to extend > ExpectedOutput with another class that does just that. If you take a > look at UnorderedOutput Unorder

Re: [PATCH] Support regex in EXPECTED ERR list

2013-01-25 Thread Ben Reser
On Thu, Jan 24, 2013 at 10:35 PM, Prabhu Gnana Sundar wrote: > But how do we find if the list contains just strings or regexes. I am not > sure of any concrete idea for this. > > We can set is_regex_list = True only if we are sure that the list contains > regexes. > > > So far, we supported three