Can't get diff between BASE and WORKING using SVNKit

Question

I would like to use SVNDiffClient to get wc local changes, equivalent of 'svn diff -rBASE', which is exactly what this example is suposed to do.

However, running the code from example throws 'org.tmatesoft.svn.core.SVNException: svn: At least one revision must be non-local for a pegged diff', which is exactly what documentation says it would.

I would like to be able to compare WORKING to BASE without hitting the server, to see if there were any changes. Can this be accomplished using SVNKit?

score 1 · Answer 1 · answered Jun 18 '12 at 22:16

1

You may use new API:

    final ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream();

    final SvnDiff diff = svnOperationFactory.createDiff();
    diff.setSources(SvnTarget.fromFile(workingCopyDirectory, SVNRevision.BASE), SvnTarget.fromFile(workingCopyDirectory, SVNRevision.WORKING));
    diff.setOutput(byteArrayOutputStream);
    diff.run();

answered Jun 18 '12 at 22:16

Dmitry Pavlenko

8,530
3
30
38

Not an option. Project's stuck with SVNKit 1.3.2. – mkvcvc Jun 19 '12 at 14:05

score 1 · Accepted Answer · answered Jun 19 '12 at 14:57

You may also use old API:

final SVNClientManager clientManager = SVNClientManager.newInstance();
try {
    final SVNDiffClient diffClient = clientManager.getDiffClient();

    final ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
    diffClient.doDiff(workingCopyDirectory, SVNRevision.BASE, workingCopyDirectory, SVNRevision.WORKING, SVNDepth.INFINITY, false, outputStream, null);

    System.out.println(outputStream);
} finally {
    clientManager.dispose();
}

Can't get diff between BASE and WORKING using SVNKit

2 Answers2