Package | Description |
---|---|
com.perforce.p4java.client |
Provides interfaces for accessing and manipulating Perforce client workspaces and associated objects.
|
com.perforce.p4java.impl.mapbased.client | |
com.perforce.p4java.option.client |
Modifier and Type | Method and Description |
---|---|
List<IFileSpec> |
IClient.mergeFiles(IFileSpec fromFile,
List<IFileSpec> toFiles,
MergeFilesOptions opts)
Merges changes from one set of files (the 'source') into another (the 'target').
|
Modifier and Type | Method and Description |
---|---|
List<IFileSpec> |
Client.mergeFiles(IFileSpec fromFile,
List<IFileSpec> toFiles,
MergeFilesOptions opts) |
Modifier and Type | Method and Description |
---|---|
MergeFilesOptions |
MergeFilesOptions.setBidirectionalInteg(boolean bidirectionalInteg) |
MergeFilesOptions |
MergeFilesOptions.setBranch(String branch) |
MergeFilesOptions |
MergeFilesOptions.setChangelistId(int changelistId) |
MergeFilesOptions |
MergeFilesOptions.setForceStreamMerge(boolean forceStreamMerge) |
MergeFilesOptions |
MergeFilesOptions.setMaxFiles(int maxFiles) |
MergeFilesOptions |
MergeFilesOptions.setParentStream(String parentStream) |
MergeFilesOptions |
MergeFilesOptions.setQuiet(boolean quiet) |
MergeFilesOptions |
MergeFilesOptions.setReverseMapping(boolean reverseMapping) |
MergeFilesOptions |
MergeFilesOptions.setShowActionsOnly(boolean showActionsOnly) |
MergeFilesOptions |
MergeFilesOptions.setStream(String stream) |
Copyright © 2017 Perforce Software. All Rights Reserved.