|
| |
|
| java.lang.Object
 org.libresource.so6.core.exec.FindConflict
| FindConflict | | public class FindConflict (Code) | | The FindConflict class is used to search into a Workspace if
some files have conflict inside or if two version of a file are in conflict.
The result is presented in a list of file on the standard output.
- When it's written conflict "on" file then it means thats a version
conflict.
- When it's written conflict "in" file then it means there's conflicts
inside the text file.
author:
Smack
version:
1.0, 26/05/04
See Also: org.libresource.so6.core.exec.Main
since:
JDK1.4 |
| Inner Class :public static class ConflictFile | |
| Method Summary | |
| public static boolean | isFileInConflict(String basePath, String path)
Check inside a file if it contains at least a bloc of conflict. | | public static void | main(String[] args)
The FindConflict class is used to search into a Workspace
if some files have conflict inside or if two version of a file are in
conflict. | | public static Collection | searchConflict(String wscPath)
Search into the workspace of a connection the set of conflicts. |
| isFileInConflict | | public static boolean isFileInConflict(String basePath, String path) throws Exception(Code) | | Check inside a file if it contains at least a bloc of conflict.
Parameters:
basePath -
Parameters:
path - @throwsException |
| main | | public static void main(String[] args) throws Exception(Code) | | The FindConflict class is used to search into a Workspace
if some files have conflict inside or if two version of a file are in
conflict.
The result is presented in a list of file on the standard output.
- When it's written conflict "on" file then it means thats a version
conflict.
- When it's written conflict "in" file then it means there's conflicts
inside the text file.
Parameters:
args - - The WsConnection property file path(.so6/1/so6.properties)
throws:
Exception - |
| searchConflict | | public static Collection searchConflict(String wscPath) throws Exception(Code) | | Search into the workspace of a connection the set of conflicts.
Parameters:
wscPath - The set of ConflictFile
throws:
Exception - |
|
|
|