| java.lang.Object
 org.tmatesoft.svn.core.wc.SVNBasicClient
org.tmatesoft.svn.core.wc.SVNDiffClient
| SVNDiffClient | | public class SVNDiffClient extends SVNBasicClient (Code) | | The SVNDiffClient class provides methods allowing to get differences
between versioned items ('diff' operation) as well as ones intended for
merging file contents.
Here's a list of the SVNDiffClient's methods
matched against corresponing commands of the SVN command line
client:
| SVNKit |
Subversion |
| doDiff() | 'svn diff' |
| doDiffStatus() | 'svn diff --summarize' |
| doMerge() | 'svn merge' |
version:
1.1.1
author:
TMate Software Ltd. |
| Constructor Summary | |
| public | SVNDiffClient(ISVNAuthenticationManager authManager, ISVNOptions options)
Constructs and initializes an SVNDiffClient object
with the specified run-time configuration and authentication
drivers.
If options is null,
then this SVNDiffClient will be using a default run-time
configuration driver which takes client-side settings from the
default SVN's run-time configuration area but is not able to
change those settings (read more on
ISVNOptions and
SVNWCUtil ). | | public | SVNDiffClient(ISVNRepositoryPool repositoryPool, ISVNOptions options)
|
| Method Summary | |
| public void | doDiff(SVNURL url, SVNRevision pegRevision, SVNRevision rN, SVNRevision rM, boolean recursive, boolean useAncestry, OutputStream result)
Generates the differences for the specified URL taken from the two
specified revisions and writes the result to the provided output
stream. | | public void | doDiff(File path, SVNRevision pegRevision, SVNRevision rN, SVNRevision rM, boolean recursive, boolean useAncestry, OutputStream result)
Generates the differences for the specified path taken from the two
specified revisions and writes the result to the provided output
stream.
If rM is a local revision (see
SVNRevision.isLocal ),
then the Working Copy path is compared with the corresponding
repository file at revision rN (that is similar to the SVN command
line client's 'svn diff -r N path' command). | | public void | doDiff(SVNURL url1, SVNRevision rN, SVNURL url2, SVNRevision rM, boolean recursive, boolean useAncestry, OutputStream result)
Generates the differences for the specified URLs taken from the two
specified revisions and writes the result to the provided output
stream. | | public void | doDiff(File path1, SVNRevision rN, SVNURL url2, SVNRevision rM, boolean recursive, boolean useAncestry, OutputStream result)
Generates the differences comparing the specified URL in a certain
revision against either the specified Working Copy path or its repository
location URL in the specified revision, and writes the result to the provided output
stream. | | public void | doDiff(SVNURL url1, SVNRevision rN, File path2, SVNRevision rM, boolean recursive, boolean useAncestry, OutputStream result)
Generates the differences comparing either the specified Working Copy path or
its repository location URL in the specified revision against the specified URL
in a certain revision, and writes the result to the provided output stream. | | public void | doDiff(File path1, SVNRevision rN, File path2, SVNRevision rM, boolean recursive, boolean useAncestry, OutputStream result)
Generates the differences comparing either the specified Working Copy paths or
their repository location URLs (any combinations are possible) in the specified
revisions and writes the result to the provided output stream. | | public void | doDiffStatus(File path1, SVNRevision rN, File path2, SVNRevision rM, boolean recursive, boolean useAncestry, ISVNDiffStatusHandler handler)
Diffs one path against another one providing short status-like change information to the provided
handler. | | public void | doDiffStatus(File path1, SVNRevision rN, SVNURL url2, SVNRevision rM, boolean recursive, boolean useAncestry, ISVNDiffStatusHandler handler)
Diffs a path against a url providing short status-like change information to the provided
handler. | | public void | doDiffStatus(SVNURL url1, SVNRevision rN, File path2, SVNRevision rM, boolean recursive, boolean useAncestry, ISVNDiffStatusHandler handler)
Diffs a url against a path providing short status-like change information to the provided
handler. | | public void | doDiffStatus(SVNURL url1, SVNRevision rN, SVNURL url2, SVNRevision rM, boolean recursive, boolean useAncestry, ISVNDiffStatusHandler handler)
Diffs one url against another one providing short status-like change information to the provided
handler. | | public void | doMerge(File path1, SVNRevision revision1, File path2, SVNRevision revision2, File dstPath, boolean recusrsive, boolean useAncestry, boolean force, boolean dryRun)
Applies the differences between two sources (using Working Copy paths to
get corresponding URLs of the sources) to a Working Copy path.
Corresponds to the SVN command line client's
'svn merge sourceWCPATH1@rev1 sourceWCPATH2@rev2 WCPATH' command.
If you need only to try merging your file(s) without actual merging, you
should set dryRun to true.
Your event handler will be dispatched status type information on the target
path(s). | | public void | doMerge(File path1, SVNRevision revision1, SVNURL url2, SVNRevision revision2, File dstPath, boolean recusrsive, boolean useAncestry, boolean force, boolean dryRun)
Applies the differences between two sources (a source URL against the
repository location URL of a source Working Copy path) to a Working Copy
path.
If you need only to try merging your file(s) without actual merging, you
should set dryRun to true.
Your event handler will be dispatched status type information on the target
path(s). | | public void | doMerge(SVNURL url1, SVNRevision revision1, File path2, SVNRevision revision2, File dstPath, boolean recusrsive, boolean useAncestry, boolean force, boolean dryRun)
Applies the differences between two sources (the repository location URL of
a source Working Copy against a source URL) to a Working Copy path.
If you need only to try merging your file(s) without actual merging, you
should set dryRun to true.
Your event handler will be dispatched status type information on the target
path(s). | | public void | doMerge(SVNURL url1, SVNRevision revision1, SVNURL url2, SVNRevision revision2, File dstPath, boolean recusrsive, boolean useAncestry, boolean force, boolean dryRun)
Applies the differences between two sources (one source URL against another
source URL) to a Working Copy path.
Corresponds to the SVN command line client's
'svn merge sourceURL1@rev1 sourceURL2@rev2 WCPATH' command.
If you need only to try merging your file(s) without actual merging, you
should set dryRun to true.
Your event handler will be dispatched status type information on the target
path(s). | | public void | doMerge(SVNURL url1, SVNRevision pegRevision, SVNRevision revision1, SVNRevision revision2, File dstPath, boolean recusrsive, boolean useAncestry, boolean force, boolean dryRun)
Applies the differences between two sources (a source URL in a particular
revision against the same source URL in another particular revision) to a
Working Copy path.
Corresponds to the SVN command line client's
'svn merge -r rev1:rev2 URL@pegRev WCPATH' command.
If you need only to try merging your file(s) without actual merging, you
should set dryRun to true.
Your event handler will be dispatched status type information on the target
path(s). | | public void | doMerge(File path1, SVNRevision pegRevision, SVNRevision revision1, SVNRevision revision2, File dstPath, boolean recusrsive, boolean useAncestry, boolean force, boolean dryRun)
Applies the differences between two sources (the repository location of
a source Working Copy path in a particular revision against the repository
location of the same path in another particular revision) to a
Working Copy path.
Corresponds to the SVN command line client's
'svn merge -r rev1:rev2 sourceWCPATH@pegRev WCPATH' command.
If you need only to try merging your file(s) without actual merging, you
should set dryRun to true.
Your event handler will be dispatched status type information on the target
path(s). | | public ISVNDiffGenerator | getDiffGenerator()
Returns the diff driver being in use.
If no specific diff driver was previously provided, a default one
will be returned (see
DefaultSVNDiffGenerator ). | | public SVNDiffOptions | getMergeOptions()
Gets the diff options that are used in merge operations
by this client. | | public void | setDiffGenerator(ISVNDiffGenerator diffGenerator)
Sets the specified diff driver for this object to use for
generating and writing file differences to an otput stream.
If no specific diff driver was set in this way, a default one
will be used (see
DefaultSVNDiffGenerator ). | | public void | setMergeOptions(SVNDiffOptions diffOptions)
Sets diff options for this client to use in merge operations. |
| SVNDiffClient | | public SVNDiffClient(ISVNAuthenticationManager authManager, ISVNOptions options)(Code) | | Constructs and initializes an SVNDiffClient object
with the specified run-time configuration and authentication
drivers.
If options is null,
then this SVNDiffClient will be using a default run-time
configuration driver which takes client-side settings from the
default SVN's run-time configuration area but is not able to
change those settings (read more on
ISVNOptions and
SVNWCUtil ).
If authManager is null,
then this SVNDiffClient will be using a default authentication
and network layers driver (see
SVNWCUtil.createDefaultAuthenticationManager )
which uses server-side settings and auth storage from the
default SVN's run-time configuration area (or system properties
if that area is not found).
Parameters:
authManager - an authentication and network layers driver
Parameters:
options - a run-time configuration options driver |
| doDiff | | public void doDiff(SVNURL url, SVNRevision pegRevision, SVNRevision rN, SVNRevision rM, boolean recursive, boolean useAncestry, OutputStream result) throws SVNException(Code) | | Generates the differences for the specified URL taken from the two
specified revisions and writes the result to the provided output
stream.
Corresponds to the SVN command line client's
'svn diff -r N:M URL' command.
Parameters:
url - a repository location
Parameters:
pegRevision - a revision in which url is first looked up
Parameters:
rN - an old revision
Parameters:
rM - a new revision
Parameters:
recursive - true to descend recursively
Parameters:
useAncestry - if true thenthe paths ancestry will be noticed while calculating differences,otherwise not
Parameters:
result - the target java.io.OutputStream wherethe differences will be written to
throws:
SVNException - if one of the following is true: - at least one of
rN, rM andpegRevision is invalid - at least one of
rN and rM isa local revision (see SVNRevision.isLocal) url was not found in rNurl was not found in rM
|
| doDiff | | public void doDiff(File path, SVNRevision pegRevision, SVNRevision rN, SVNRevision rM, boolean recursive, boolean useAncestry, OutputStream result) throws SVNException(Code) | | Generates the differences for the specified path taken from the two
specified revisions and writes the result to the provided output
stream.
If rM is a local revision (see
SVNRevision.isLocal ),
then the Working Copy path is compared with the corresponding
repository file at revision rN (that is similar to the SVN command
line client's 'svn diff -r N path' command).
Otherwise if both rN and rM are non-local, then
the repository location of path is compared for these
revisions ('svn diff -r N:M URL').
Parameters:
path - a Working Copy file path
Parameters:
pegRevision - a revision in which the repository location of path is first looked up
Parameters:
rN - an old revision
Parameters:
rM - a new revision (or a local one)
Parameters:
recursive - true to descend recursively
Parameters:
useAncestry - if true thenthe paths ancestry will be noticed while calculating differences,otherwise not
Parameters:
result - the target java.io.OutputStream wherethe differences will be written to
throws:
SVNException - if one of the following is true: - at least one of
rN, rM andpegRevision is invalid - both
rN and rM are local revisions path was not found in rNpath was not found in rM
|
| doDiff | | public void doDiff(SVNURL url1, SVNRevision rN, SVNURL url2, SVNRevision rM, boolean recursive, boolean useAncestry, OutputStream result) throws SVNException(Code) | | Generates the differences for the specified URLs taken from the two
specified revisions and writes the result to the provided output
stream.
Corresponds to the SVN command line client's
'svn diff -r N:M URL1 URL2' command.
Parameters:
url1 - the first URL to be compared
Parameters:
rN - a revision of url1
Parameters:
url2 - the second URL to be compared
Parameters:
rM - a revision of url2
Parameters:
recursive - true to descend recursively
Parameters:
useAncestry - if true thenthe paths ancestry will be noticed while calculating differences,otherwise not
Parameters:
result - the target java.io.OutputStream wherethe differences will be written to
throws:
SVNException - if one of the following is true: - at least one of
rN and rM isinvalid url1 was not found in rNurl2 was not found in rM
|
| doDiff | | public void doDiff(File path1, SVNRevision rN, SVNURL url2, SVNRevision rM, boolean recursive, boolean useAncestry, OutputStream result) throws SVNException(Code) | | Generates the differences comparing the specified URL in a certain
revision against either the specified Working Copy path or its repository
location URL in the specified revision, and writes the result to the provided output
stream.
If rN is not a local revision (see
SVNRevision.isLocal ),
then its repository location URL as it is in the revision represented by
rN is taken for comparison with url2.
Corresponds to the SVN command line client's
'svn diff -r N:M PATH URL' command.
Parameters:
path1 - a WC path
Parameters:
rN - a revision of path1
Parameters:
url2 - a repository location URL that is to be compared against path1 (or its repository location)
Parameters:
rM - a revision of url2
Parameters:
recursive - true to descend recursively
Parameters:
useAncestry - if true thenthe paths ancestry will be noticed while calculating differences,otherwise not
Parameters:
result - the target java.io.OutputStream wherethe differences will be written to
throws:
SVNException - if one of the following is true: - at least one of
rN and rM isinvalid path1 is not under version controlpath1 has no URLurl2 was not found in rM- the repository location of
path1 was not found in rN
|
| doDiff | | public void doDiff(SVNURL url1, SVNRevision rN, File path2, SVNRevision rM, boolean recursive, boolean useAncestry, OutputStream result) throws SVNException(Code) | | Generates the differences comparing either the specified Working Copy path or
its repository location URL in the specified revision against the specified URL
in a certain revision, and writes the result to the provided output stream.
If rM is not a local revision (see
SVNRevision.isLocal ),
then its repository location URL as it is in the revision represented by
rM is taken for comparison with url1.
Corresponds to the SVN command line client's
'svn diff -r N:M URL PATH' command.
Parameters:
url1 - a repository location URL
Parameters:
rN - a revision of url1
Parameters:
path2 - a WC path that is to be compared against url1
Parameters:
rM - a revision of path2
Parameters:
recursive - true to descend recursively
Parameters:
useAncestry - if true thenthe paths ancestry will be noticed while calculating differences,otherwise not
Parameters:
result - the target java.io.OutputStream wherethe differences will be written to
throws:
SVNException - if one of the following is true: - at least one of
rN and rM isinvalid path2 is not under version controlpath2 has no URLurl1 was not found in rN- the repository location of
path2 was not found in rM
|
| doDiff | | public void doDiff(File path1, SVNRevision rN, File path2, SVNRevision rM, boolean recursive, boolean useAncestry, OutputStream result) throws SVNException(Code) | | Generates the differences comparing either the specified Working Copy paths or
their repository location URLs (any combinations are possible) in the specified
revisions and writes the result to the provided output stream.
If both rN and rM are local revisions (see
SVNRevision.isLocal ),
then a Working Copy path2 is compared against a Working Copy path1.
If rN is a local revision but rM is not, then
the repository location URL of path2 as it is in the revision
represented by rM is compared against the Working Copy path1.
If rM is a local revision but rN is not, then
the Working Copy path2 is compared against the repository location
URL of path1 as it is in the revision represented by rN.
If both rN and rM are non-local revisions, then the
repository location URL of path2 in revision rM is
compared against the repository location URL of path1 in revision
rN.
Parameters:
path1 - a WC path
Parameters:
rN - a revision of path1
Parameters:
path2 - a WC path that is to be compared against path1
Parameters:
rM - a revision of path2
Parameters:
recursive - true to descend recursively
Parameters:
useAncestry - if true thenthe paths ancestry will be noticed while calculating differences,otherwise not
Parameters:
result - the target java.io.OutputStream wherethe differences will be written to
throws:
SVNException - if one of the following is true: - at least one of
rN and rM isinvalid path1 is not under version controlpath1 has no URLpath2 is not under version controlpath2 has no URL- the repository location of
path1 was not found in rN - the repository location of
path2 was not found in rM - both
rN and rM are local,but either path1 does not equal path2,or rN is not SVNRevision.BASE, orrM is not SVNRevision.WORKING
|
| doDiffStatus | | public void doDiffStatus(File path1, SVNRevision rN, File path2, SVNRevision rM, boolean recursive, boolean useAncestry, ISVNDiffStatusHandler handler) throws SVNException(Code) | | Diffs one path against another one providing short status-like change information to the provided
handler. This method functionality is equivalent to the 'svn diff --summarize' command.
Parameters:
path1 - the path of a left-hand item to diff
Parameters:
rN - a revision of path1
Parameters:
path2 - the path of a right-hand item to diff
Parameters:
rM - a revision of path2
Parameters:
recursive - controls whether operation must recurse or not
Parameters:
useAncestry - if true thenthe paths ancestry will be noticed while calculating differences,otherwise not
Parameters:
handler - a diff status handler
throws:
SVNException -
since:
1.1, new in Subversion 1.4 |
| doDiffStatus | | public void doDiffStatus(File path1, SVNRevision rN, SVNURL url2, SVNRevision rM, boolean recursive, boolean useAncestry, ISVNDiffStatusHandler handler) throws SVNException(Code) | | Diffs a path against a url providing short status-like change information to the provided
handler. This method functionality is equivalent to the 'svn diff --summarize' command.
Parameters:
path1 - the path of a left-hand item to diff
Parameters:
rN - a revision of path1
Parameters:
url2 - the url of a right-hand item to diff
Parameters:
rM - a revision of url2
Parameters:
recursive - controls whether operation must recurse or not
Parameters:
useAncestry - if true thenthe paths ancestry will be noticed while calculating differences,otherwise not
Parameters:
handler - a diff status handler
throws:
SVNException -
since:
1.1, new in Subversion 1.4 |
| doDiffStatus | | public void doDiffStatus(SVNURL url1, SVNRevision rN, File path2, SVNRevision rM, boolean recursive, boolean useAncestry, ISVNDiffStatusHandler handler) throws SVNException(Code) | | Diffs a url against a path providing short status-like change information to the provided
handler. This method functionality is equivalent to the 'svn diff --summarize' command.
Parameters:
url1 - the url of a left-hand item to diff
Parameters:
rN - a revision of url1
Parameters:
path2 - the path of a right-hand item to diff
Parameters:
rM - a revision of path2
Parameters:
recursive - controls whether operation must recurse or not
Parameters:
useAncestry - if true thenthe paths ancestry will be noticed while calculating differences,otherwise not
Parameters:
handler - a diff status handler
throws:
SVNException -
since:
1.1, new in Subversion 1.4 |
| doDiffStatus | | public void doDiffStatus(SVNURL url1, SVNRevision rN, SVNURL url2, SVNRevision rM, boolean recursive, boolean useAncestry, ISVNDiffStatusHandler handler) throws SVNException(Code) | | Diffs one url against another one providing short status-like change information to the provided
handler. This method functionality is equivalent to the 'svn diff --summarize' command.
Parameters:
url1 - the url of a left-hand item to diff
Parameters:
rN - a revision of url1
Parameters:
url2 - the url of a right-hand item to diff
Parameters:
rM - a revision of url2
Parameters:
recursive - controls whether operation must recurse or not
Parameters:
useAncestry - if true thenthe paths ancestry will be noticed while calculating differences,otherwise not
Parameters:
handler - a diff status handler
throws:
SVNException -
since:
1.1, new in Subversion 1.4 |
| doMerge | | public void doMerge(File path1, SVNRevision revision1, File path2, SVNRevision revision2, File dstPath, boolean recusrsive, boolean useAncestry, boolean force, boolean dryRun) throws SVNException(Code) | | Applies the differences between two sources (using Working Copy paths to
get corresponding URLs of the sources) to a Working Copy path.
Corresponds to the SVN command line client's
'svn merge sourceWCPATH1@rev1 sourceWCPATH2@rev2 WCPATH' command.
If you need only to try merging your file(s) without actual merging, you
should set dryRun to true.
Your event handler will be dispatched status type information on the target
path(s). If a path can be successfully merged, the status type will be
SVNStatusType.MERGED for that path.
Parameters:
path1 - the first source path
Parameters:
revision1 - a revision of path1
Parameters:
path2 - the second source path which URL is to be comparedagainst the URL of path1
Parameters:
revision2 - a revision of path2
Parameters:
dstPath - the target path to which the result shouldbe applied
Parameters:
recusrsive - true to descend recursively
Parameters:
useAncestry - if true thenthe paths ancestry will be noticed while calculating differences,otherwise not
Parameters:
force - true toforce the operation to run
Parameters:
dryRun - if true thenonly tries the operation to run (to find outif a file can be merged successfully)
throws:
SVNException - if one of the following is true: - at least one of
revision1 and revision2 isinvalid path1 has no URLpath2 has no URL- the repository location of
path1 was not found in revision1 - the repository location of
path2 was not found in revision2 dstPath is not under version control
|
| doMerge | | public void doMerge(File path1, SVNRevision revision1, SVNURL url2, SVNRevision revision2, File dstPath, boolean recusrsive, boolean useAncestry, boolean force, boolean dryRun) throws SVNException(Code) | | Applies the differences between two sources (a source URL against the
repository location URL of a source Working Copy path) to a Working Copy
path.
If you need only to try merging your file(s) without actual merging, you
should set dryRun to true.
Your event handler will be dispatched status type information on the target
path(s). If a path can be successfully merged, the status type will be
SVNStatusType.MERGED for that path.
Parameters:
path1 - the first source - a WC path
Parameters:
revision1 - a revision of path1
Parameters:
url2 - the second source - a URL that is to be compared against the URL of path1
Parameters:
revision2 - a revision of url2
Parameters:
dstPath - the target path to which the result shouldbe applied
Parameters:
recusrsive - true to descend recursively
Parameters:
useAncestry - if true thenthe paths ancestry will be noticed while calculating differences,otherwise not
Parameters:
force - true toforce the operation to run
Parameters:
dryRun - if true thenonly tries the operation to run (to find outif a file can be merged successfully)
throws:
SVNException - if one of the following is true: - at least one of
revision1 and revision2 isinvalid path1 has no URL- the repository location of
path1 was not found in revision1 url2 was not found in revision2dstPath is not under version control
|
| doMerge | | public void doMerge(SVNURL url1, SVNRevision revision1, File path2, SVNRevision revision2, File dstPath, boolean recusrsive, boolean useAncestry, boolean force, boolean dryRun) throws SVNException(Code) | | Applies the differences between two sources (the repository location URL of
a source Working Copy against a source URL) to a Working Copy path.
If you need only to try merging your file(s) without actual merging, you
should set dryRun to true.
Your event handler will be dispatched status type information on the target
path(s). If a path can be successfully merged, the status type will be
SVNStatusType.MERGED for that path.
Parameters:
url1 - the first source - a URL
Parameters:
revision1 - a revision of url1
Parameters:
path2 - the second source - a WC path that is to be compared against url1
Parameters:
revision2 - a revision of path2
Parameters:
dstPath - the target path to which the result shouldbe applied
Parameters:
recusrsive - true to descend recursively
Parameters:
useAncestry - if true thenthe paths ancestry will be noticed while calculating differences,otherwise not
Parameters:
force - true toforce the operation to run
Parameters:
dryRun - if true thenonly tries the operation to run (to find outif a file can be merged successfully)
throws:
SVNException - if one of the following is true: - at least one of
revision1 and revision2 isinvalid path2 has no URLurl1 was not found in revision1- the repository location of
path2 was not found in revision2 dstPath is not under version control
|
| doMerge | | public void doMerge(SVNURL url1, SVNRevision revision1, SVNURL url2, SVNRevision revision2, File dstPath, boolean recusrsive, boolean useAncestry, boolean force, boolean dryRun) throws SVNException(Code) | | Applies the differences between two sources (one source URL against another
source URL) to a Working Copy path.
Corresponds to the SVN command line client's
'svn merge sourceURL1@rev1 sourceURL2@rev2 WCPATH' command.
If you need only to try merging your file(s) without actual merging, you
should set dryRun to true.
Your event handler will be dispatched status type information on the target
path(s). If a path can be successfully merged, the status type will be
SVNStatusType.MERGED for that path.
Parameters:
url1 - the first source URL
Parameters:
revision1 - a revision of url1
Parameters:
url2 - the second source URL that is to be compared against url1
Parameters:
revision2 - a revision of url2
Parameters:
dstPath - the target path to which the result shouldbe applied
Parameters:
recusrsive - true to descend recursively
Parameters:
useAncestry - if true thenthe paths ancestry will be noticed while calculating differences,otherwise not
Parameters:
force - true toforce the operation to run
Parameters:
dryRun - if true thenonly tries the operation to run (to find outif a file can be merged successfully)
throws:
SVNException - if one of the following is true: - at least one of
revision1 and revision2 isinvalid url1 was not found in revision1url2 was not found in revision2dstPath is not under version control
|
| doMerge | | public void doMerge(SVNURL url1, SVNRevision pegRevision, SVNRevision revision1, SVNRevision revision2, File dstPath, boolean recusrsive, boolean useAncestry, boolean force, boolean dryRun) throws SVNException(Code) | | Applies the differences between two sources (a source URL in a particular
revision against the same source URL in another particular revision) to a
Working Copy path.
Corresponds to the SVN command line client's
'svn merge -r rev1:rev2 URL@pegRev WCPATH' command.
If you need only to try merging your file(s) without actual merging, you
should set dryRun to true.
Your event handler will be dispatched status type information on the target
path(s). If a path can be successfully merged, the status type will be
SVNStatusType.MERGED for that path.
Parameters:
url1 - a source URL
Parameters:
pegRevision - a revision in which code>url1 is first looked up
Parameters:
revision1 - a left-hand revision of url1
Parameters:
revision2 - a right-hand revision of url1
Parameters:
dstPath - the target path to which the result shouldbe applied
Parameters:
recusrsive - true to descend recursively
Parameters:
useAncestry - if true thenthe paths ancestry will be noticed while calculating differences,otherwise not
Parameters:
force - true toforce the operation to run
Parameters:
dryRun - if true thenonly tries the operation to run (to find outif a file can be merged successfully)
throws:
SVNException - if one of the following is true: - at least one of
revision1, revision2 andpegRevision is invalid url1 was not found in revision1url1 was not found in revision2dstPath is not under version control
|
| doMerge | | public void doMerge(File path1, SVNRevision pegRevision, SVNRevision revision1, SVNRevision revision2, File dstPath, boolean recusrsive, boolean useAncestry, boolean force, boolean dryRun) throws SVNException(Code) | | Applies the differences between two sources (the repository location of
a source Working Copy path in a particular revision against the repository
location of the same path in another particular revision) to a
Working Copy path.
Corresponds to the SVN command line client's
'svn merge -r rev1:rev2 sourceWCPATH@pegRev WCPATH' command.
If you need only to try merging your file(s) without actual merging, you
should set dryRun to true.
Your event handler will be dispatched status type information on the target
path(s). If a path can be successfully merged, the status type will be
SVNStatusType.MERGED for that path.
Parameters:
path1 - a source WC path
Parameters:
pegRevision - a revision in which the repository location of path1 is first looked up
Parameters:
revision1 - a left-hand revision of path1
Parameters:
revision2 - a right-hand revision of path1
Parameters:
dstPath - the target path to which the result shouldbe applied
Parameters:
recusrsive - true to descend recursively
Parameters:
useAncestry - if true thenthe paths ancestry will be noticed while calculating differences,otherwise not
Parameters:
force - true toforce the operation to run
Parameters:
dryRun - if true thenonly tries the operation to run (to find outif a file can be merged successfully)
throws:
SVNException - if one of the following is true: - at least one of
revision1, revision2 andpegRevision is invalid path1 has no URL- the repository location of
path1 was not found in revision1 - the repository location of
path1 was not found in revision2 dstPath is not under version control
|
| getMergeOptions | | public SVNDiffOptions getMergeOptions()(Code) | | Gets the diff options that are used in merge operations
by this client. Creates a new one if none was used before.
diff options |
| setDiffGenerator | | public void setDiffGenerator(ISVNDiffGenerator diffGenerator)(Code) | | Sets the specified diff driver for this object to use for
generating and writing file differences to an otput stream.
If no specific diff driver was set in this way, a default one
will be used (see
DefaultSVNDiffGenerator ).
Parameters:
diffGenerator - a diff driver
See Also: SVNDiffClient.getDiffGenerator() |
| setMergeOptions | | public void setMergeOptions(SVNDiffOptions diffOptions)(Code) | | Sets diff options for this client to use in merge operations.
Parameters:
diffOptions - diff options object |
| Methods inherited from org.tmatesoft.svn.core.wc.SVNBasicClient | public void checkCancelled() throws SVNCancelException(Code)(Java Doc)
protected SVNRepository createRepository(SVNURL url, boolean mayReuse) throws SVNException(Code)(Java Doc)
protected SVNRepository createRepository(SVNURL url, File path, SVNRevision pegRevision, SVNRevision revision) throws SVNException(Code)(Java Doc)
protected SVNRepository createRepository(SVNURL url, File path, SVNRevision pegRevision, SVNRevision revision, long[] pegRev) throws SVNException(Code)(Java Doc)
protected SVNWCAccess createWCAccess()(Code)(Java Doc)
protected SVNWCAccess createWCAccess(String pathPrefix)(Code)(Java Doc)
protected void dispatchEvent(SVNEvent event) throws SVNException(Code)(Java Doc)
protected void dispatchEvent(SVNEvent event, double progress) throws SVNException(Code)(Java Doc)
public ISVNDebugLog getDebugLog()(Code)(Java Doc)
protected ISVNEventHandler getEventDispatcher()(Code)(Java Doc)
protected SVNRepositoryLocation[] getLocations(SVNURL url, File path, SVNRepository repository, SVNRevision revision, SVNRevision start, SVNRevision end) throws SVNException(Code)(Java Doc)
public ISVNOptions getOptions()(Code)(Java Doc)
protected ISVNRepositoryPool getRepositoryPool()(Code)(Java Doc)
protected long getRevisionNumber(SVNRevision revision, SVNRepository repository, File path) throws SVNException(Code)(Java Doc)
protected SVNURL getURL(File path) throws SVNException(Code)(Java Doc)
public void handleEvent(SVNEvent event, double progress) throws SVNException(Code)(Java Doc)
public boolean isIgnoreExternals()(Code)(Java Doc)
public boolean isLeaveConflictsUnresolved()(Code)(Java Doc)
public void setDebugLog(ISVNDebugLog log)(Code)(Java Doc)
public void setEventHandler(ISVNEventHandler dispatcher)(Code)(Java Doc)
public void setEventPathPrefix(String prefix)(Code)(Java Doc)
public void setIgnoreExternals(boolean ignore)(Code)(Java Doc)
public void setLeaveConflictsUnresolved(boolean leave)(Code)(Java Doc)
public void setOptions(ISVNOptions options)(Code)(Java Doc)
protected void sleepForTimeStamp()(Code)(Java Doc)
|
|
|