Custom conflict resolution process: relative paths [message #653812] |
Fri, 11 February 2011 11:06 |
Guillaume P. Messages: 69 Registered: June 2010 Location: Toulouse, France |
Member |
|
|
Hi,
I'm trying to create a connector overriding some SvnKitConnector behavior, especially the conflict resolution process.
I've added to my connector a ConflictResolver like this:
public class MyTracedConnector extends SVNKitConnector {
public MyTracedConnector() {
super();
setConflictResolver(new ISVNConflictResolutionCallback() {
@Override
public SVNConflictResolution resolve(
SVNConflictDescriptor descriptor)
throws SVNConnectorException {
// if EMF model file, try to resolve the conflict
if (isMyFileType(descriptor.localPath)) {
// TODO: try to resolve the conflict
return new SVNConflictResolution(SVNConflictResolution.POSTPONE, descriptor.localPath);
// else, do nothing more --> not resolved
} else {
return new SVNConflictResolution(SVNConflictResolution.POSTPONE, descriptor.mergedPath);
}
}
});
}
...
The problem is that at the TODO point, I have to way to know what file we are speaking about as all path given by the SVNConflictDescriptor are relative to the file having the conflict... So I'm unable to read these files and to try to resolve the conflict myself.
Is there a solution I've not seen ?
Regards,
Guillaume
|
|
|
Powered by
FUDForum. Page generated in 0.03826 seconds