Uses of Class
org.tmatesoft.svn.core.wc.SVNMergeFileSet

Packages that use SVNMergeFileSet

Package	Description
org.tmatesoft.svn.cli.svn
org.tmatesoft.svn.core.internal.wc
org.tmatesoft.svn.core.internal.wc17
org.tmatesoft.svn.core.wc	This package provides a high-level API for managing Working Copies in a way compatible with the native SVN command line client.

Uses of SVNMergeFileSet in org.tmatesoft.svn.cli.svn

Methods in org.tmatesoft.svn.cli.svn with parameters of type SVNMergeFileSet

Modifier and Type	Method	Description
private void	SVNCommandLineConflictHandler.showConflictedChunks(SVNMergeFileSet files)

Uses of SVNMergeFileSet in org.tmatesoft.svn.core.internal.wc

Methods in org.tmatesoft.svn.core.internal.wc with parameters of type SVNMergeFileSet

Modifier and Type	Method	Description
protected DefaultSVNMergerAction	DefaultSVNMerger.getMergeAction(SVNMergeFileSet files, SVNMergeResult mergeResult)
protected SVNMergeResult	DefaultSVNMerger.handleChooseBase(SVNMergeFileSet files)
protected SVNMergeResult	DefaultSVNMerger.handleChooseConflicted(boolean chooseMine, SVNMergeFileSet files)
protected SVNMergeResult	DefaultSVNMerger.handleChooseMerged(SVNMergeFileSet files, SVNMergeResult mergeResult)
protected SVNMergeResult	DefaultSVNMerger.handleChooseRepository(SVNMergeFileSet files)
protected SVNMergeResult	DefaultSVNMerger.handleChooseWorking(SVNMergeFileSet files)
protected SVNMergeResult	DefaultSVNMerger.handleMarkBinaryConflicted(SVNMergeFileSet files)
protected SVNMergeResult	DefaultSVNMerger.handleMarkConflicted(SVNMergeFileSet files)
protected SVNMergeResult	DefaultSVNMerger.handleMarkResolved(SVNMergeFileSet files, SVNMergeResult mergeResult)
protected SVNMergeResult	DefaultSVNMerger.handleMarkTextConflicted(SVNMergeFileSet files)
protected void	DefaultSVNMerger.makeBinaryConflictEntry(SVNMergeFileSet files, java.lang.String newFilePath, java.lang.String oldFilePath)
protected void	DefaultSVNMerger.makeTextConflictEntry(SVNMergeFileSet files, java.lang.String mineFilePath, java.lang.String newFilePath, java.lang.String oldFilePath)
SVNMergeResult	AbstractSVNMerger.mergeText(SVNMergeFileSet files, boolean dryRun, SVNDiffOptions options)
protected void	DefaultSVNMerger.postMergeCleanup(SVNMergeFileSet files)
protected abstract SVNMergeResult	AbstractSVNMerger.processMergedFiles(SVNMergeFileSet files, SVNMergeResult mergeResult)
protected SVNMergeResult	DefaultSVNMerger.processMergedFiles(SVNMergeFileSet files, SVNMergeResult mergeResult)

Uses of SVNMergeFileSet in org.tmatesoft.svn.core.internal.wc17

Methods in org.tmatesoft.svn.core.internal.wc17 with parameters of type SVNMergeFileSet

Modifier and Type	Method	Description
SVNMergeResult	DefaultSvnMerger.mergeText(SVNMergeFileSet files, boolean dryRun, SVNDiffOptions options)

Uses of SVNMergeFileSet in org.tmatesoft.svn.core.wc

Fields in org.tmatesoft.svn.core.wc declared as SVNMergeFileSet

Modifier and Type	Field	Description
private SVNMergeFileSet	SVNConflictDescription.myMergeFiles

Methods in org.tmatesoft.svn.core.wc that return SVNMergeFileSet

Modifier and Type	Method	Description
SVNMergeFileSet	SVNConflictDescription.getMergeFiles()	Returns information about files involved in the merge.

Methods in org.tmatesoft.svn.core.wc with parameters of type SVNMergeFileSet

Modifier and Type	Method	Description
SVNMergeResult	ISVNMerger.mergeText(SVNMergeFileSet files, boolean dryRun, SVNDiffOptions options)	Performs a text merge.

Constructors in org.tmatesoft.svn.core.wc with parameters of type SVNMergeFileSet

Modifier	Constructor	Description
	SVNConflictDescription(SVNMergeFileSet mergeFiles, SVNNodeKind nodeKind, SVNConflictAction conflictAction, SVNConflictReason conflictReason)	Creates a new SVNConflictDescription object.
	SVNPropertyConflictDescription(SVNMergeFileSet mergeFiles, SVNNodeKind nodeKind, java.lang.String propertyName, SVNConflictAction conflictAction, SVNConflictReason conflictReason)	Creates a new SVNPropertyConflictDescription object.
	SVNTextConflictDescription(SVNMergeFileSet mergeFiles, SVNNodeKind nodeKind, SVNConflictAction conflictAction, SVNConflictReason conflictReason)	Creates a new SVNTextConflictDescription object.