Re: svn commit: r1304614 - /subversion/trunk/subversion/libsvn_client/merge.c

2012-03-27 Thread Philip Martin
Philip Martin writes: > Philip Martin writes: > >> What's going on? > > The change fixes the test by causing the -r9:1 merge to be done in the > "right" way as -r8:6 then -r6:1 With r1304613 I get valgrind warnings on the failing merge: ==6510== Conditional jump or move depends on uninitialise

Re: svn commit: r1304614 - /subversion/trunk/subversion/libsvn_client/merge.c

2012-03-27 Thread Philip Martin
Philip Martin writes: > What's going on? The change fixes the test by causing the -r9:1 merge to be done in the "right" way as -r8:6 then -r6:1 With r1304614 I see the two sub-ranges merged: 2012-03-27 14:34:00 [INFO] CMD: svn merge file:///home/pm/sw/subversion/obj2/subversion/tests/cmdline/

Re: svn commit: r1304614 - /subversion/trunk/subversion/libsvn_client/merge.c

2012-03-27 Thread Philip Martin
Julian Foad writes: > I (Julian Foad) wrote: > >> Daniel Shahaf wrote: >>> This revision turned merge_tests.py 127 into XPASS on >>> svn-slik-w2k3-x64-ra.  It passes for me too in HEAD. >>> >>> XPASS: merge_tests.py 127: reverse merge applies revs in reverse order >> >> Thanks.  It's XPASS f

Re: svn commit: r1304614 - /subversion/trunk/subversion/libsvn_client/merge.c

2012-03-25 Thread Greg Stein
On Sun, Mar 25, 2012 at 13:16, Julian Foad wrote: > Greg Stein wrote: >> julianf...@apache.org wrote: >>> Change the members of 'merge_source_t' from in-line to pointers. >>> A follow-up to r1303807. >> This says what you did, but I don't understand the justification for it. The >> code seems mor

Re: svn commit: r1304614 - /subversion/trunk/subversion/libsvn_client/merge.c

2012-03-25 Thread Julian Foad
I (Julian Foad) wrote: > Daniel Shahaf wrote: >> This revision turned merge_tests.py 127 into XPASS on >> svn-slik-w2k3-x64-ra.  It passes for me too in HEAD. >> >> XPASS: merge_tests.py 127: reverse merge applies revs in reverse order > > Thanks.  It's XPASS for me too; I didn't realize my c

Re: svn commit: r1304614 - /subversion/trunk/subversion/libsvn_client/merge.c

2012-03-25 Thread Julian Foad
Greg Stein wrote: > julianf...@apache.org wrote: >> Change the members of 'merge_source_t' from in-line to pointers. >> A follow-up to r1303807. > This says what you did, but I don't understand the justification for it. The > code seems more complicated now (eg. the create/dup functions). >?? Go

Re: svn commit: r1304614 - /subversion/trunk/subversion/libsvn_client/merge.c

2012-03-25 Thread Julian Foad
Daniel Shahaf wrote: > This revision turned merge_tests.py 127 into XPASS on > svn-slik-w2k3-x64-ra.  It passes for me too in HEAD. > > XPASS: merge_tests.py 127: reverse merge applies revs in reverse order Thanks.  It's XPASS for me too; I didn't realize my change made it so. Investigating...

Re: svn commit: r1304614 - /subversion/trunk/subversion/libsvn_client/merge.c

2012-03-24 Thread Daniel Shahaf
This revision turned merge_tests.py 127 into XPASS on svn-slik-w2k3-x64-ra. It passes for me too in HEAD. XPASS: merge_tests.py 127: reverse merge applies revs in reverse order Greg Stein wrote on Fri, Mar 23, 2012 at 19:38:49 -0400: > On Mar 23, 2012 5:35 PM, wrote: > > > > Author: julianfoad

Re: svn commit: r1304614 - /subversion/trunk/subversion/libsvn_client/merge.c

2012-03-23 Thread Greg Stein
On Mar 23, 2012 5:35 PM, wrote: > > Author: julianfoad > Date: Fri Mar 23 21:34:53 2012 > New Revision: 1304614 > > URL: http://svn.apache.org/viewvc?rev=1304614&view=rev > Log: > Change the members of 'merge_source_t' from in-line to pointers. > A follow-up to r1303807. This says what you did, b