Examples of org.tmatesoft.svn.core.wc.ISVNConflictHandler

org.tmatesoft.svn.core.wc.ISVNConflictHandler
The ISVNConflictHandler interface defines a callback for resolving conflicts during the application of a tree delta to a working copy. Implementations of this callback are free to present the conflict using any user interface. This may include simple contextual conflicts in a file's text or properties, or more complex 'tree'-based conflcts related to obstructed additions, deletions, and edits. The callback implementation is free to decide which sorts of conflicts to handle; it's also free to decide which types of conflicts are automatically resolvable and which require user interaction. @version 1.3 @author TMate Software Ltd. @since 1.2

        return mySVNEventListener;
    }


    protected ISVNConflictHandler getConflictHandler() {
        if (mySVNConflictHandler == null && myConflictResolverCallback != null) {
            mySVNConflictHandler = new ISVNConflictHandler() {


                public SVNConflictResult handleConflict(SVNConflictDescription conflictDescription) throws SVNException {
                    SVNConflictResult result = null;
                    if (myConflictResolverCallback != null) {
                        ConflictDescriptor descriptor = JavaHLObjectFactory.createConflictDescription(conflictDescription);

View Full Code Here

        return mySVNEventListener;
    }


    protected ISVNConflictHandler getConflictHandler() {
        if (mySVNConflictHandler == null && myConflictResolverCallback != null) {
            mySVNConflictHandler = new ISVNConflictHandler() {


                public SVNConflictResult handleConflict(SVNConflictDescription conflictDescription) throws SVNException {
                    SVNConflictResult result = null;
                    if (myConflictResolverCallback != null) {
                        ConflictDescriptor descriptor = JavaHLObjectFactory.createConflictDescription(conflictDescription);

View Full Code Here

TOP

Related Classes of org.tmatesoft.svn.core.wc.ISVNConflictHandler

org.tmatesoft.svn.core.javahl.SVNClientImpl

All source code are property of their respective owners. Java is a trademark of Sun Microsystems, Inc and owned by ORACLE Inc. Contact coftware#gmail.com.