Re: 1.6 vs. 1.8: strange behavior of 'svn diff -cN WC-FILE' if the file was created in rev N by copying

2013-06-26 Thread Tobias Bading
On 25.06.2013, at 23:20, Ben Reser wrote: > On Tue, Jun 25, 2013 at 10:56 PM, Stefan Sperling wrote: >> I'm not quite sure if we can already recommend the --git diff option >> for widespread use. > > Then we shouldn't have released with it enabled. Releasing a command > with an option and then s

Re: 1.6 vs. 1.8: strange behavior of 'svn diff -cN WC-FILE' if the file was created in rev N by copying

2013-06-26 Thread Johan Corveleyn
On Wed, Jun 26, 2013 at 3:01 PM, Stefan Sperling wrote: > On Wed, Jun 26, 2013 at 01:39:59PM +0200, Johan Corveleyn wrote: >> As Tobias pointed out, 'svn diff' does indeed do the diff against the >> copy source, but *only if you're lucky*. I would consider this erratic >> behavior definitely a bug

Re: svn commit: r1496886 - /subversion/trunk/subversion/libsvn_client/ra.c

2013-06-26 Thread Stefan Sperling
On Wed, Jun 26, 2013 at 05:50:58PM +0200, Stefan Fuhrmann wrote: > On Wed, Jun 26, 2013 at 2:52 PM, Stefan Sperling wrote: > > > On Wed, Jun 26, 2013 at 02:46:29PM +0200, Stefan Sperling wrote: > > > I think this block of code should either enforce and fulfill the > > > API contract in the exact

Re: svn commit: r1496886 - /subversion/trunk/subversion/libsvn_client/ra.c

2013-06-26 Thread Stefan Fuhrmann
On Wed, Jun 26, 2013 at 2:46 PM, Stefan Sperling wrote: > On Wed, Jun 26, 2013 at 11:48:49AM -, stef...@apache.org wrote: > > Author: stefan2 > > Date: Wed Jun 26 11:48:49 2013 > > New Revision: 1496886 > > > > URL: http://svn.apache.org/r1496886 > > Log: > > Follow-up to r1494966: When revi

Re: svn commit: r1496886 - /subversion/trunk/subversion/libsvn_client/ra.c

2013-06-26 Thread Stefan Fuhrmann
On Wed, Jun 26, 2013 at 2:52 PM, Stefan Sperling wrote: > On Wed, Jun 26, 2013 at 02:46:29PM +0200, Stefan Sperling wrote: > > I think this block of code should either enforce and fulfill the > > API contract in the exact same way as svn_ra_get_location_segments() > > does, or it should not exist

Re: vimdiff wrapper for diff-cmd not working with 1.8

2013-06-26 Thread Michael Schlottke
On Jun 21, 2013, at 15:23 , Philip Martin wrote: > Another user raised the issue > > http://subversion.tigris.org/issues/show_bug.cgi?id=4382 > > Using '--diff-cmd colordiff' to get coloured output no longer works. > > Here's a solution that requires the user to mark the command as > requiring

Re: 1.6 vs. 1.8: strange behavior of 'svn diff -cN WC-FILE' if the file was created in rev N by copying

2013-06-26 Thread Stefan Sperling
On Wed, Jun 26, 2013 at 01:39:59PM +0200, Johan Corveleyn wrote: > As Tobias pointed out, 'svn diff' does indeed do the diff against the > copy source, but *only if you're lucky*. I would consider this erratic > behavior definitely a bug, because it makes the output unpredictable, > and thus unusab

Re: svn commit: r1496886 - /subversion/trunk/subversion/libsvn_client/ra.c

2013-06-26 Thread Stefan Sperling
On Wed, Jun 26, 2013 at 02:46:29PM +0200, Stefan Sperling wrote: > I think this block of code should either enforce and fulfill the > API contract in the exact same way as svn_ra_get_location_segments() > does, or it should not exist at all. I don't think we should bother > with optimizations that

Re: svn commit: r1496886 - /subversion/trunk/subversion/libsvn_client/ra.c

2013-06-26 Thread Stefan Sperling
On Wed, Jun 26, 2013 at 11:48:49AM -, stef...@apache.org wrote: > Author: stefan2 > Date: Wed Jun 26 11:48:49 2013 > New Revision: 1496886 > > URL: http://svn.apache.org/r1496886 > Log: > Follow-up to r1494966: When revisions are not given, set them to 0 / HEAD, > respectively. Also, return

Re: nested_moves tests (r1496885) Re: Ev2 as a move-aware editor

2013-06-26 Thread Daniel Shahaf
Daniel Shahaf wrote on Wed, Jun 26, 2013 at 15:18:52 +0300: > That patch isn't ready for commit; I am only at the point of > constructing a State object that will make the test pass, but I haven't > yet compared that State object to the actual moves the test does to > determine whether the 'svn sta

Re: Ev2 as a move-aware editor

2013-06-26 Thread Philip Martin
Philip Martin writes: > I can't see any way to do the 9-node change without using temporaries. I think we can reduce the 9 nodes to 6 and still see the problem: svnadmin create repo svnmucc -mm -U file://`pwd`/repo \ mkdir A mkdir A/B mkdir A/B/C \ mkdir X mkdir X/Y mkdir X/Y/Z svnmuc

Re: Ev2 as a move-aware editor

2013-06-26 Thread Daniel Shahaf
Branko Čibej wrote on Wed, Jun 26, 2013 at 13:33:00 +0200: > On 26.06.2013 11:46, Daniel Shahaf wrote: > > Greg Stein wrote on Wed, Jun 26, 2013 at 05:30:10 -0400: > >> On Wed, Jun 26, 2013 at 5:25 AM, Daniel Shahaf wrote: > >>> Philip Martin wrote on Wed, Jun 26, 2013 at 09:30:42 +0100: > Gr

nested_moves tests (r1496885) Re: Ev2 as a move-aware editor

2013-06-26 Thread Daniel Shahaf
I've gone ahead and added Python tests for the below scenarios: Philip's scenario in move_tests.py and mine in svnmucc_tests.py. I have an odd problem with Philip's scenario (move_tests.py nested_replaces): if I set expected_status['A/B'] to an Item(status='A '), I get an error stating the actual

Re: Ev2 as a move-aware editor

2013-06-26 Thread Philip Martin
Daniel Shahaf writes: > First sketch: > > move(/A/B, /X/Y/Z/B) > move(/M/N, /A/B/C/N) > move(/X/Y, /M/N/O/Y) > rotate(/A, /M/N/O, /X, /A/B/C, /M, /X/Y/Z) > > The final rotate() call looks tricky: it moves something to /M and > something to /M/N/O, so the former move must be handle

Re: svn commit: r1494966 - /subversion/trunk/subversion/libsvn_client/ra.c

2013-06-26 Thread Stefan Fuhrmann
On Tue, Jun 25, 2013 at 10:34 AM, Stefan Sperling wrote: > On Thu, Jun 20, 2013 at 12:56:05PM -, stef...@apache.org wrote: > > Author: stefan2 > > Date: Thu Jun 20 12:56:05 2013 > > New Revision: 1494966 > > > > URL: http://svn.apache.org/r1494966 > > Log: > > Optimize 'svn log' and related o

Re: 1.6 vs. 1.8: strange behavior of 'svn diff -cN WC-FILE' if the file was created in rev N by copying

2013-06-26 Thread Johan Corveleyn
On Wed, Jun 26, 2013 at 11:51 AM, Stefan Sperling wrote: > On Tue, Jun 25, 2013 at 11:20:02PM +0200, Ben Reser wrote: ... >> > Johan pointed out that svnlook diff seems to traverse to the copyfrom >> > source even in case 2). If this is indeed the case, these commands are >> > now behaving in cont

Re: Ev2 as a move-aware editor

2013-06-26 Thread Branko Čibej
On 26.06.2013 11:46, Daniel Shahaf wrote: > Greg Stein wrote on Wed, Jun 26, 2013 at 05:30:10 -0400: >> On Wed, Jun 26, 2013 at 5:25 AM, Daniel Shahaf wrote: >>> Philip Martin wrote on Wed, Jun 26, 2013 at 09:30:42 +0100: Greg Stein writes: > You're affecting six nodes, so I think y

Re: 1.6 vs. 1.8: strange behavior of 'svn diff -cN WC-FILE' if the file was created in rev N by copying

2013-06-26 Thread Stefan Sperling
On Tue, Jun 25, 2013 at 11:20:02PM +0200, Ben Reser wrote: > E.G. here's the behavior based on the example environment produced by > the script in the original post: > [[[ > svn diff -r1:3 --show-copies-as-adds wc/f2 > Index: wc/f1 >

Re: Ev2 as a move-aware editor

2013-06-26 Thread Daniel Shahaf
Greg Stein wrote on Wed, Jun 26, 2013 at 05:30:10 -0400: > On Wed, Jun 26, 2013 at 5:25 AM, Daniel Shahaf wrote: > > Philip Martin wrote on Wed, Jun 26, 2013 at 09:30:42 +0100: > >> Greg Stein writes: > >> > >> > You're affecting six nodes, so I think you should be able to pack this > >> > down i

Re: Ev2 as a move-aware editor

2013-06-26 Thread Philip Martin
Daniel Shahaf writes: > Philip Martin wrote on Wed, Jun 26, 2013 at 09:30:42 +0100: >> Greg Stein writes: >> >> > You're affecting six nodes, so I think you should be able to pack this >> > down into touching 6 nodes once each. I believe this will work: >> > >> > move(A/B, X/Y/Z/B) >> > rotate(

Re: Ev2 as a move-aware editor

2013-06-26 Thread Daniel Shahaf
Daniel Shahaf wrote on Tue, Jun 25, 2013 at 21:53:07 +: > On Tue, Jun 25, 2013 at 12:42:55PM +0100, Philip Martin wrote: > >R /A (from /X/Y/Z:1) > >A /A/B (from /A/B:1) > >R /A/B/C (from /X:1) > >D /A/B/C/Y > >R /X (from /A/B/C:1) > >A /X/Y (from /X/Y:1) > >R /X/Y/Z

Re: Ev2 as a move-aware editor

2013-06-26 Thread Greg Stein
On Wed, Jun 26, 2013 at 5:25 AM, Daniel Shahaf wrote: > Philip Martin wrote on Wed, Jun 26, 2013 at 09:30:42 +0100: >> Greg Stein writes: >> >> > You're affecting six nodes, so I think you should be able to pack this >> > down into touching 6 nodes once each. I believe this will work: >> > >> > m

Re: 1.6 vs. 1.8: strange behavior of 'svn diff -cN WC-FILE' if the file was created in rev N by copying

2013-06-26 Thread Stefan Sperling
On Wed, Jun 26, 2013 at 12:15:22AM +0200, Branko Čibej wrote: > The point where this breaks is when you want to create a diff that can > be applied by plain-vanilla patch and will remove one file and add > another one. That case requires different output, and maybe > --show-copies-as-adds is the ri

Re: Ev2 as a move-aware editor

2013-06-26 Thread Daniel Shahaf
Philip Martin wrote on Wed, Jun 26, 2013 at 09:30:42 +0100: > Greg Stein writes: > > > You're affecting six nodes, so I think you should be able to pack this > > down into touching 6 nodes once each. I believe this will work: > > > > move(A/B, X/Y/Z/B) > > rotate(A, X/Y/Z) > > move(X/Y, A/B/C/Y)

Re: svn commit: r1495419 - in /subversion/trunk/subversion/libsvn_ra_serf: options.c ra_serf.h serf.c util.c

2013-06-26 Thread Stefan Sperling
On Wed, Jun 26, 2013 at 12:36:22AM +0200, Lieven Govaerts wrote: > What you say is not correct, the reason has been explained earlier in > this thread: > http://svn.haxx.se/dev/archive-2013-06/0530.shtml I'm OK with making the extra request conditional on a config knob. However, as you said in th

Re: svn commit: r1496127 - /subversion/trunk/subversion/tests/cmdline/checkout_tests.py

2013-06-26 Thread Philip Martin
Greg Stein writes: > We turn off the client sleeping for a second (via that crazy env var) > during the test suite. That doesn't affect this test. The timestamps involved are commit times which are not limited by filesystem resolution but by internal clock resolution. > How about for this *one

Re: Ev2 as a move-aware editor

2013-06-26 Thread Philip Martin
Greg Stein writes: > You're affecting six nodes, so I think you should be able to pack this > down into touching 6 nodes once each. I believe this will work: > > move(A/B, X/Y/Z/B) > rotate(A, X/Y/Z) > move(X/Y, A/B/C/Y) > rotate(X, A/B/C) Yes, I think that works. > Insert appropriate alter() c