Re: Issue #2044 - Fully customizable external diff invocations

2013-03-21 Thread Julian Foad
Gabriela Gibson wrote: > On 21/03/13 15:05, Julian Foad wrote: >> - Does Subversion provide good labels? I have been using >> 'diff3-cmd' configured to run kdiff3, and the labels Subversion passes >> to it are like '.mine', '.r1459015' and '.r1459080' -- they don't >> include the file name at

RE: svn commit: r1459478 - /subversion/trunk/subversion/include/svn_delta.h

2013-03-21 Thread Bert Huijben
> -Original Message- > From: cmpil...@apache.org [mailto:cmpil...@apache.org] > Sent: donderdag 21 maart 2013 12:03 > To: comm...@subversion.apache.org > Subject: svn commit: r1459478 - > /subversion/trunk/subversion/include/svn_delta.h > > Author: cmpilato > Date: Thu Mar 21 19:02:49 20

Re: Issue #2044 - Fully customizable external diff invocations

2013-03-21 Thread Gabriela Gibson
On 21/03/13 15:05, Julian Foad wrote: > - Does Subversion provide good labels? I have been using > 'diff3-cmd' configured to run kdiff3, and the labels Subversion passes > to it are like '.mine', '.r1459015' and '.r1459080' -- they don't > include the file name at all, which makes it very hard to

Re: svn commit: r1459410 - /subversion/trunk/subversion/tests/cmdline/merge_tests.py

2013-03-21 Thread Julian Foad
Bert Huijben wrote: >> URL: http://svn.apache.org/r1459410 >> Log: >> In several tests in merge_tests.py, change directory to the WC first, so >> the paths printed during the test run are much shorter than they would >> otherwise be, to ease debugging. > > Can we make this optional behavio

Re: Environment variables in hook scripts?

2013-03-21 Thread Branko Čibej
On 21.03.2013 18:26, Philip Martin wrote: > Philip Martin writes: > >> So it seems that there is a bug in apr_proc_create on Windows. >> Subversion might be able to work around this bug by explicitly passing >> an non-null, empty environment to apr_proc_create. > If Subversion were to start doing

RE: svn commit: r1459410 - /subversion/trunk/subversion/tests/cmdline/merge_tests.py

2013-03-21 Thread Bert Huijben
> -Original Message- > From: julianf...@apache.org [mailto:julianf...@apache.org] > Sent: donderdag 21 maart 2013 10:18 > To: comm...@subversion.apache.org > Subject: svn commit: r1459410 - > /subversion/trunk/subversion/tests/cmdline/merge_tests.py > > Author: julianfoad > Date: Thu Mar

Re: [PATCH] Fix issue #4316 - Merge errors out after resolving conflicts

2013-03-21 Thread Julian Foad
Paul Burba wrote: > On Wed, Mar 20, 2013 at 4:15 PM, Julian Foad wrote: >>> I have committed a complete fix, with the Summary of Conflicts as >>> discussed here, in . >> >> Remaining issues: >> >>   * There is an inconsistency with what rev ranges get recorde

Re: Environment variables in hook scripts?

2013-03-21 Thread Philip Martin
Philip Martin writes: > So it seems that there is a bug in apr_proc_create on Windows. > Subversion might be able to work around this bug by explicitly passing > an non-null, empty environment to apr_proc_create. If Subversion were to start doing this it would probably break lots of (most?) exis

Re: Environment variables in hook scripts?

2013-03-21 Thread Philip Martin
Pavel Lyalyakin writes: > [[ > Before Subversion calls a hook script, it removes all variables -- > including $PATH on Unix, and %PATH% on Windows -- from the > environment. Therefore, your script can only run another program if > you spell out that program's absolute name. > ]] > > Is this state

RE: svn commit: r1459058 - in /subversion/trunk/subversion: include/private/svn_dep_compat.h include/private/svn_subr_private.h libsvn_ra_serf/serf.c libsvn_subr/hash.c libsvn_wc/adm_ops.c svn/notify.

2013-03-21 Thread Bert Huijben
> -Original Message- > From: MARTIN PHILIP [mailto:codematt...@ntlworld.com] On Behalf Of > Philip Martin > Sent: donderdag 21 maart 2013 09:38 > To: Julian Foad > Cc: Branko Čibej; dev@subversion.apache.org > Subject: Re: svn commit: r1459058 - in /subversion/trunk/subversion: > include/

Re: svn commit: r1459058 - in /subversion/trunk/subversion: include/private/svn_dep_compat.h include/private/svn_subr_private.h libsvn_ra_serf/serf.c libsvn_subr/hash.c libsvn_wc/adm_ops.c svn/notify.

2013-03-21 Thread Philip Martin
Julian Foad writes: > Philip Martin wrote: > >> I see similar warning for svn_dbg__preamble, svn_dbg__printf, >> svn_dbg__print_props, svn_error__locate, svn_error__trace when building >> without -DSVN_DEBUG. >> >> The dbg stuff is declared in private/svn_debug.h so I think we could >> make the

Re: Problems Reintegrating the fsfs-format7 branch

2013-03-21 Thread Stefan Fuhrmann
On Thu, Mar 21, 2013 at 4:25 PM, Paul Burba wrote: > fyi http://subversion.tigris.org/issues/show_bug.cgi?id=4329#desc7 > explains my proposed patch in terms of how it changes the symmetric > merge algorithm. > > Without reviewing the actual patch, I'm absolutely +1 with what it tries to achieve

Re: svn commit: r1459058 - in /subversion/trunk/subversion: include/private/svn_dep_compat.h include/private/svn_subr_private.h libsvn_ra_serf/serf.c libsvn_subr/hash.c libsvn_wc/adm_ops.c svn/notify.

2013-03-21 Thread Julian Foad
Philip Martin wrote: > Branko Čibej writes: >>> The declaration of svn_hash__clear is only present for old APR while the >>> definition is always visible.  I get this warning: >>> >>> ../src2/subversion/libsvn_subr/hash.c:512:1: warning: no previous >>> prototype for 'svn_hash__clear' [-Wmis

Re: svn commit: r1459058 - in /subversion/trunk/subversion: include/private/svn_dep_compat.h include/private/svn_subr_private.h libsvn_ra_serf/serf.c libsvn_subr/hash.c libsvn_wc/adm_ops.c svn/notify.

2013-03-21 Thread Julian Foad
Philip Martin wrote: > Branko Čibej writes: >>> The declaration of svn_hash__clear is only present for old APR while the >>> definition is always visible.  I get this warning: >>> >>> ../src2/subversion/libsvn_subr/hash.c:512:1: warning: no previous >>> prototype for 'svn_hash__clear' [-Wmis

Environment variables in hook scripts?

2013-03-21 Thread Pavel Lyalyakin
Hello, In the official Apache Subversion FAQ I see the entry: http://subversion.apache.org/faq.html#hook-debugging. The entry says: [[ Before Subversion calls a hook script, it removes all variables -- including $PATH on Unix, and %PATH% on Windows -- from the environment. Therefore, your script

Re: svn commit: r1459058 - in /subversion/trunk/subversion: include/private/svn_dep_compat.h include/private/svn_subr_private.h libsvn_ra_serf/serf.c libsvn_subr/hash.c libsvn_wc/adm_ops.c svn/notify.

2013-03-21 Thread Philip Martin
Branko Čibej writes: >> The declaration of svn_hash__clear is only present for old APR while the >> definition is always visible. I get this warning: >> >> ../src2/subversion/libsvn_subr/hash.c:512:1: warning: no previous prototype >> for 'svn_hash__clear' [-Wmissing-prototypes] >> >> We could

Re: Problems Reintegrating the fsfs-format7 branch

2013-03-21 Thread Paul Burba
On Fri, Mar 8, 2013 at 4:17 PM, Paul Burba wrote: > On Tue, Mar 5, 2013 at 11:37 AM, Julian Foad > wrote: >> Paul Burba wrote: >>> On Wed, Feb 27, 2013 at 5:04 PM, Julian Foad wrote: Paul Burba wrote: > I found the cause of the conflict filled reintegrate merge. The > automatic

Re: svn commit: r1459058 - in /subversion/trunk/subversion: include/private/svn_dep_compat.h include/private/svn_subr_private.h libsvn_ra_serf/serf.c libsvn_subr/hash.c libsvn_wc/adm_ops.c svn/notify.

2013-03-21 Thread Julian Foad
Branko Čibej wrote: > On 21.03.2013 14:18, Philip Martin wrote: >> julianf...@apache.org writes: >>> -svn_error_t * >>> -svn_hash__clear(apr_hash_t *hash, apr_pool_t *pool) >>> +void >>> +svn_hash__clear(apr_hash_t *hash) >>>   { >>>   #if APR_VERSION_AT_LEAST(1, 3, 0) >>>     apr_hash_clear(

Re: [PATCH] Fix issue #4316 - Merge errors out after resolving conflicts

2013-03-21 Thread Paul Burba
On Wed, Mar 20, 2013 at 4:15 PM, Julian Foad wrote: > > -- > Certified & Supported Apache Subversion Downloads: > http://www.wandisco.com/subversion/download > - Original Message - >> From: Julian Foad >> To: C. Michael Pilato >> Cc: Subversion Development >> Sent: Wednesday, 20 March

Re: Issue #2044 - Fully customizable external diff invocations

2013-03-21 Thread Julian Foad
(I've taken the liberty of changing the subject line.) Gabriela Gibson wrote: > IIRC Subversion needs to communicate the following file names to the > user's diff program: > > mine, yours, base and output You're thinking of 'merge', otherwise known as 'diff3', here? The '--diff-cmd' command-li

Re: svn commit: r1459058 - in /subversion/trunk/subversion: include/private/svn_dep_compat.h include/private/svn_subr_private.h libsvn_ra_serf/serf.c libsvn_subr/hash.c libsvn_wc/adm_ops.c svn/notify.

2013-03-21 Thread Branko Čibej
On 21.03.2013 14:18, Philip Martin wrote: > julianf...@apache.org writes: > >> Author: julianfoad >> Date: Wed Mar 20 21:14:59 2013 >> New Revision: 1459058 >> --- subversion/trunk/subversion/include/private/svn_dep_compat.h (original) >> +++ subversion/trunk/subversion/include/private/svn_dep_comp

Re: New svn_auth_cleanup_walk() API.

2013-03-21 Thread C. Michael Pilato
On 03/20/2013 05:34 PM, Bert Huijben wrote: >> -Original Message- >> From: C. Michael Pilato [mailto:cmpil...@collab.net] >> Sent: woensdag 20 maart 2013 12:14 >> To: Bert Huijben >> Cc: Subversion Development >> Subject: New svn_auth_cleanup_walk() API. >> >> Bert, >> >> I have some questi

Re: svn commit: r1459058 - in /subversion/trunk/subversion: include/private/svn_dep_compat.h include/private/svn_subr_private.h libsvn_ra_serf/serf.c libsvn_subr/hash.c libsvn_wc/adm_ops.c svn/notify.

2013-03-21 Thread Philip Martin
julianf...@apache.org writes: > Author: julianfoad > Date: Wed Mar 20 21:14:59 2013 > New Revision: 1459058 > --- subversion/trunk/subversion/include/private/svn_dep_compat.h (original) > +++ subversion/trunk/subversion/include/private/svn_dep_compat.h Wed Mar 20 > 21:14:59 2013 > @@ -62,6 +62,1

Re: New merge APIs review, and JavaHL

2013-03-21 Thread Julian Foad
Branko Čibej wrote: > There are two revised merge APIs: > >     svn_client_merge5 >     svn_client_merge_peg5 > > and also a whole new group of svn_client_automatic_merge_ APIs, and the > (not revised) svn_client_merge_reintegrate. I'm in a dilemma as to which > of these APIs to use in JavaHL; a