Re: svn commit: r1336128 - in /subversion/trunk/subversion/bindings/javahl: native/ src/org/apache/subversion/javahl/

2012-05-09 Thread Greg Stein
On Wed, May 9, 2012 at 10:07 AM, Stefan Sperling wrote: > On Wed, May 09, 2012 at 09:59:39AM -0400, Mark Phippard wrote: >> On Wed, May 9, 2012 at 8:18 AM,   wrote: >> > Author: stsp >> > Date: Wed May  9 12:18:37 2012 >> > New Revision: 1336128 > >> > @@ -561,7 +563,7 @@ public interface ISVNClie

Re: svn commit: r1336442 - in /subversion/trunk/subversion: include/private/svn_wc_private.h libsvn_client/copy.c libsvn_wc/adm_files.c

2012-05-09 Thread Greg Stein
On Wed, May 9, 2012 at 7:07 PM, wrote: >... > +++ subversion/trunk/subversion/include/private/svn_wc_private.h Wed May  9 > 23:07:40 2012 > @@ -1034,6 +1034,16 @@ svn_wc__rename_wc(svn_wc_context_t *wc_c >                   const char *dst_abspath, >                   apr_pool_t *scratch_pool);

Re: Symmetric merge -- current test failures when enabled

2012-05-09 Thread Branko Čibej
On 09.05.2012 18:54, Julian Foad wrote: > The second group concerns merging changes into a file from its own (past or > future) history; this kind of merge isn't a 'sync' so shouldn't be handled by > this code path. We keep coming back to this ... I still don't understand /why/ we would need mor

Symmetric merge -- current test failures when enabled

2012-05-09 Thread Julian Foad
In r1336079 I updated the symmetric merge base-finding code to properly follow branches that have been renamed (which includes being branched off another branch) during their lifetime. Currently there are 12 test failures, of just three kinds, in the existing test suite, when I make the symmetr

Re: svn commit: r1335639 - /subversion/trunk/subversion/libsvn_wc/adm_ops.c

2012-05-09 Thread C. Michael Pilato
On 05/08/2012 05:47 PM, Ivan Zhakov wrote: > On Wed, May 9, 2012 at 1:34 AM, Ivan Zhakov wrote: >> On Wed, May 9, 2012 at 12:49 AM, C. Michael Pilato >> wrote: >>> On 05/08/2012 04:39 PM, Mark Phippard wrote: On Tue, May 8, 2012 at 4:20 PM, Ivan Zhakov wrote: > On Wed, May 9, 2012 at 1

Re: svn commit: r1336128 - in /subversion/trunk/subversion/bindings/javahl: native/ src/org/apache/subversion/javahl/

2012-05-09 Thread Stefan Sperling
On Wed, May 09, 2012 at 09:59:39AM -0400, Mark Phippard wrote: > On Wed, May 9, 2012 at 8:18 AM, wrote: > > Author: stsp > > Date: Wed May  9 12:18:37 2012 > > New Revision: 1336128 > > @@ -561,7 +563,7 @@ public interface ISVNClient > >               OutputStream outStream, > >               De

Re: svn commit: r1336128 - in /subversion/trunk/subversion/bindings/javahl: native/ src/org/apache/subversion/javahl/

2012-05-09 Thread Mark Phippard
On Wed, May 9, 2012 at 8:18 AM, wrote: > Author: stsp > Date: Wed May  9 12:18:37 2012 > New Revision: 1336128 > > URL: http://svn.apache.org/viewvc?rev=1336128&view=rev > Log: > Blind attempt at fixing the JavaHL build after r1336110 broke it. > > [ in subversion/bindings/javahl/ ] > > * native/

Re: svn commit: r1335639 - /subversion/trunk/subversion/libsvn_wc/adm_ops.c

2012-05-09 Thread C. Michael Pilato
On 05/08/2012 05:47 PM, Ivan Zhakov wrote: > Well, it seems things are more complicated: current mod_dav_svn > implementation never sends tag and ra_serf always asks > for properties, even if there is no properties. You know, I had a memory that this had changed at some point -- something that pb