svn diff: output stops after first couple hunks?
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 results. Are there further command line options or steps I should have taken that I'm unaware of? Thanks, Laird
Local modification on checkout?
Hello; we're seeing a local modification being reported on a particular file on a clean checkout. We're using svn 1.7.7. The file in question has the svn:eol-style property set to native. What I mean by this: A fresh checkout happens (svn co ...). Down comes the whole project. So far so good. Then another part of our build infrastructure does an svn status. svn status reports that this file is locally modified (M). There are no intervening steps. That is, it's checkout, then svn status. Does automatic eol conversion show up as a local modification in svn status output? I can't reproduce this on either a Windows or a Mac. It appears to be only on this machine, which, I know, sounds mad. Thanks for any help. Best, Laird -- http://about.me/lairdnelson
Re: Local modification on checkout?
On Thu, Jan 17, 2013 at 1:40 PM, Andy Levy wrote: > Automatic EOL conversions, assuming they're adhering to svn:eol-style, > should not trigger this. > Glad to hear it. The ecosystem in question is Jenkins running on Windows, which invokes the command line svn executable (packaged/shipped by SlikSvn, version 1.7.7). Nothing else is on that box (no background processes etc.). We can't reproduce it elsewhere. I think we'll have to chalk this up to gremlins as much as it thoroughly pains me. svn diff reports that only the EOL changed. Thanks for your response; if I can figure out the sequence of events that tripped this I'll file a bug. Best, Laird -- http://about.me/lairdnelson
Re: Local modification on checkout?
One specific machine. :-( On Thu, Jan 17, 2013 at 1:56 PM, Andy Levy wrote: > > > On Thu, Jan 17, 2013 at 4:45 PM, Laird Nelson wrote: > >> On Thu, Jan 17, 2013 at 1:40 PM, Andy Levy wrote: >> >>> Automatic EOL conversions, assuming they're adhering to svn:eol-style, >>> should not trigger this. >>> >> >> Glad to hear it. >> >> The ecosystem in question is Jenkins running on Windows, which invokes >> the command line svn executable (packaged/shipped by SlikSvn, version >> 1.7.7). Nothing else is on that box (no background processes etc.). We >> can't reproduce it elsewhere. I think we'll have to chalk this up to >> gremlins as much as it thoroughly pains me. >> >> Is it Jenkins on Windows on one specific machine, or Jenkins on Windows > on any machine? > > -- http://about.me/lairdnelson
Re: Local modification on checkout?
On Thu, Jan 17, 2013 at 2:01 PM, David Chapman wrote: > Hmm, "only the EOL changed." Do you mean that literally, meaning there > is only one line in the file? If so, does the original file have a newline > at the end of the last line? Maybe newline conversion is adding one. > Thanks for your reply. No, it's a file that has two lines in it, and the line that is reported to have changed locally was the first one. Best, Laird -- http://about.me/lairdnelson
Re: Local modification on checkout?
On Thu, Jan 17, 2013 at 2:58 PM, Bert Huijben wrote: > A lot of users have SvnKit in their Jenkins installation. Are you sure that > you aren't mixing a normal svn with some svnkit version? > Oh, that is interesting. I will research that. Best, Laird -- http://about.me/lairdnelson
