Hello, Thanks for the details, but still I can't reproduce the problem with similar code. I don't need the rest of your code, that piece was enough.
Actually the server version is not important, but it's important to know working copy format (do it corresponds to 1.6 or 1.7? SVNKit has absolutely different code for different working copies). I can reproduce the problem if I set a diff generator (ISVNDiffGenerator / ISvnDiffGenerator) to the diff client (maybe using Svn[Old/New]Generator wrapper) and setting setBaseBath(pathToFile). All the path in the diff output are relative to that basePath that is equal to current directory by default (I doubt that current directory may be changed to a file, but please tell me your current directory path). Do you have an ability to debug a bit? If yes, please set breakpoints at DefaultSVNDiffGenerator#displayFileDiff (for the case if old diff generator is used) and at SvnDiffGenerator#displayContentChanged (if the new one is used). And btw this is a way to realize, which one is chosen. Both methods start with paths calculation code, and I hope it's easy to find the reason why the resulting path is empty. If not, please send values related to paths, I'll try to analyze them myself. And as an offtopic, I would recommend you to put clientManager.dispose() call somewhere, if you don't call this method yet. As you can see there's a field SVNClientManager#myRepositoryPool that keeps open SVN connections that can be reused between requests. clientManager.dispose() will close all connections from that pool. -- Dmitry Pavlenko, TMate Software, http://subgit.com/ - git+svn on the server side > Hello, > > > Thanks for your time. > > You can have a look at the full code here: > https://bitbucket.org/sofico/bamboo-svntoolkit-plugin/src/488181031a0d/src/ > main/java/be/sofico/bamboo/plugins/SVNDiffTask.java It is part of my bamboo > plug-in, you can find the code by the end of the file. > > I adapted the diff output a bid in my previous post to simplify, here's > the full text as outputted: > > Before update: > > Index: > /data/bamboo-home/xml-data/build-dir/CODEDIFFS-CORE-JOB1/core/_java/source/ > be/sofico/basecamp/general/SofDeleteSequences.java > =================================================================== --- > /data/bamboo-home/xml-data/build-dir/CODEDIFFS-CORE-JOB1/core/_java/source/ > be/sofico/basecamp/general/SofDeleteSequences.java (revision 162123) > +++ > /data/bamboo-home/xml-data/build-dir/CODEDIFFS-CORE-JOB1/core/_java/source/ > be/sofico/basecamp/general/SofDeleteSequences.java (working copy) > @@ -35,8 +35,6 @@ > public static final int DYNAMICPROPERTYTYPE = -1; > public static final int INSTALLATIONHISTORY = -1; > > After update: > > Index: > =================================================================== > --- (revision 162288) > +++ (working copy) > @@ -2209,6 +2209,7 @@ > public static final int VEHICLEMGR_LINKED_TO_FLEETVEHICLE = 30651; > public static final int > VEHICLEMGR_UPDATE_NOT_ALLOWED_WITH_CONTRACT = 30665; > > > Is a part of the source tree (working set) good enough? Sending the full > source will be hard (size and security wise). > (how can I send it?) > > many thanks, > jan > > Jan Swaelens > Development > Sofico NV - www.sofico.be > Technologiepark 1, B-9052 Zwijnaarde, Belgium > Tel +32 9 210 80 40 - Mobile +32 My Mobile > > > > From: > Dmitry Pavlenko <pavle...@tmatesoft.com> > To: > svnkit-users@svnkit.com, > Cc: > Jan Swaelens <jan.swael...@sofico.be> > Date: > 08/14/2012 04:45 PM > Subject: > Re: Changes to the output of diff after upgrade to 1.7.4-v1 > > > > Hello, > I can't reproduce the problem. Could you please provide all the code > related to diff with arguments > (what revisions do you use --- numbers, HEAD/WORKING/BASE?)? > > It would be good if you could provide any working copy on which the > problem is reproducible. > > From the first glance looks like paths printed are relative to > .../MyFile.java, that is a bit > strange. > > -- > Dmitry Pavlenko, > TMate Software, > http://subgit.com/ - git+svn on the server side > > > Hello, > > > > I am getting different output of the diff operation after migrating from > > svnkit-1.3.7 to svnkit-1.7.4-v1. > > > > The output used to be like this (notice the file path information): > > > > Index: /data//source/some/package/MyFile.java > > =================================================================== > > --- /data//source/some/package/MyFile.java (revision 162123) > > +++ /data//source/some/package/MyFile.java (working copy) > > @@ -35,8 +35,6 @@ > > ... > > > > After the update I am getting this (notice the missing path > > information): > > Index: > > =================================================================== > > --- (revision 162123) > > +++ (working copy) > > @@ -35,8 +35,6 @@ > > ... > > > > Notice that the path/file info is missing ... I already tried to run the > > diff on a newly checked out workspace but this had no effect. > > How can I get the path info back? > > > > I am using this call to perform the diff: > > org.tmatesoft.svn.core.wc.SVNDiffClient.doDiff(File, SVNRevision, > > SVNRevision, SVNRevision, SVNDepth, boolean, OutputStream, Collection) > > > > > > Many thanks!
