[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

svn diff: output stops after first couple hunks?

From: Laird Nelson <ljnelson_at_gmail.com>
Date: Tue, 30 Nov 2010 16:18:21 -0500

Hello, and thanks, first of all, for a great version control system.

I am seeing a very odd behavior that I hope I can chalk up to pilot error.

One of my developers on Windows 7, running the CollabNet-supported
Subversion 1.6.13 binaries, does this command:

svn diff pom.xml

...in a directory with a pom.xml file that has some local changes. She
knows and I know that the upstream Subversion repository, being hosted by
Subversion 1.6.2 on a Windows XP box as part of an Apache installation,
contains a newer version of this file.

svn diff correctly outputs what looks like the first couple hunks. We both
see what we're expecting to see. Then mysteriously on her machine only,
that is all that diff reports. When I take her locally modified file, and
place it in my up-to-date workspace, and run svn diff on it--trying as best
as I am able to replicate her environment--I see those same hunks, but then
I see MORE hunks.

I am on a Mac, running Subversion 1.6.5 which came with the machine.

Are there known diff issues like this? If it is simply an output problem,
then that's one thing, but since diffs are at the core of Subversion's logic
I want to make sure we flesh this out if indeed there's a problem.

I've attempted on her machine to run svn diff -x -w pom.xml with the same

Are there further command line options or steps I should have taken that I'm
unaware of?

Received on 2010-12-01 09:21:38 CET

This is an archived mail posted to the Subversion Users mailing list.

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.