package org.tigris.subversion.svnclientadapter.javahl;

import org.tigris.subversion.javahl.ConflictDescriptor;
import org.tigris.subversion.javahl.ConflictResolverCallback;
import org.tigris.subversion.javahl.SubversionException;
import org.tigris.subversion.svnclientadapter.ISVNConflictResolver;
import org.tigris.subversion.svnclientadapter.SVNClientException;

public class JhlConflictResolver implements ConflictResolverCallback {
	
	ISVNConflictResolver worker;

	public JhlConflictResolver(ISVNConflictResolver worker) {
		super();
		this.worker = worker;
	}

	public int resolve(ConflictDescriptor descrip)
			throws SubversionException {
		try {
			return worker.resolve(JhlConverter.convertConflictDescriptor(descrip));
		} catch (SVNClientException e) {
			throw new JhlException(e);
		}
	}

}

@@ -167,16 +167,68 @@
 llback;%0A
+import org.tigris.subversion.javahl.ConflictResult;%0A
 import o
@@ -625,10 +625,21 @@
 lic 
-in
+ConflictResul
 t re
@@ -722,16 +722,35 @@
 %09return 
+new ConflictResult(
 worker.r
@@ -804,16 +804,23 @@
 escrip))
+, null)
 ;%0A%09%09%7D ca

Update for changes in JavaHL conflict resolution callback