/** * @since 1.5 */ public void merge(String path1, Revision revision1, String path2, Revision revision2, String localPath, boolean force, int depth, boolean ignoreAncestry, boolean dryRun, boolean recordOnly) throws ClientException { synchronized (clazz) { worker.merge(path1, revision1, path2, revision2, localPath, force, depth, ignoreAncestry, dryRun, recordOnly); } }
/** * @deprecated Use {@link #merge(String, Revision, String, Revision, * String, boolean, int, boolean, * boolean, boolean)} instead. * @since 1.0 */ public void merge(String path1, Revision revision1, String path2, Revision revision2, String localPath, boolean force, boolean recurse) throws ClientException { merge(path1, revision1, path2, revision2, localPath, force, recurse, false, false); }
/** * @since 1.5 */ public void merge(String path1, Revision revision1, String path2, Revision revision2, String localPath, boolean force, int depth, boolean ignoreAncestry, boolean dryRun, boolean recordOnly) throws ClientException { synchronized (clazz) { worker.merge(path1, revision1, path2, revision2, localPath, force, depth, ignoreAncestry, dryRun, recordOnly); } }
/** * @deprecated Use {@link #merge(String, Revision, String, Revision, * String, boolean, int, boolean, * boolean, boolean)} instead. * @since 1.0 */ public void merge(String path1, Revision revision1, String path2, Revision revision2, String localPath, boolean force, boolean recurse) throws ClientException { merge(path1, revision1, path2, revision2, localPath, force, recurse, false, false); }
/** * @since 1.5 */ public void merge(String path1, Revision revision1, String path2, Revision revision2, String localPath, boolean force, int depth, boolean ignoreAncestry, boolean dryRun, boolean recordOnly) throws ClientException { synchronized (clazz) { worker.merge(path1, revision1, path2, revision2, localPath, force, depth, ignoreAncestry, dryRun, recordOnly); } }
/** * @since 1.5 */ public void merge(String path1, Revision revision1, String path2, Revision revision2, String localPath, boolean force, int depth, boolean ignoreAncestry, boolean dryRun, boolean recordOnly) throws ClientException { synchronized (clazz) { worker.merge(path1, revision1, path2, revision2, localPath, force, depth, ignoreAncestry, dryRun, recordOnly); } }
/** * @since 1.5 */ public void merge(String path, Revision pegRevision, RevisionRange[] revisions, String localPath, boolean force, int depth, boolean ignoreAncestry, boolean dryRun, boolean recordOnly) throws ClientException { synchronized(clazz) { worker.merge(path, pegRevision, revisions, localPath, force, depth, ignoreAncestry, dryRun, recordOnly); } }
/** * @since 1.5 */ public void merge(String path, Revision pegRevision, RevisionRange[] revisions, String localPath, boolean force, int depth, boolean ignoreAncestry, boolean dryRun, boolean recordOnly) throws ClientException { synchronized(clazz) { worker.merge(path, pegRevision, revisions, localPath, force, depth, ignoreAncestry, dryRun, recordOnly); } }
/** * @since 1.5 */ public void merge(String path, Revision pegRevision, RevisionRange[] revisions, String localPath, boolean force, int depth, boolean ignoreAncestry, boolean dryRun, boolean recordOnly) throws ClientException { synchronized(clazz) { worker.merge(path, pegRevision, revisions, localPath, force, depth, ignoreAncestry, dryRun, recordOnly); } }
/** * @since 1.5 */ public void merge(String path, Revision pegRevision, RevisionRange[] revisions, String localPath, boolean force, int depth, boolean ignoreAncestry, boolean dryRun, boolean recordOnly) throws ClientException { synchronized(clazz) { worker.merge(path, pegRevision, revisions, localPath, force, depth, ignoreAncestry, dryRun, recordOnly); } }
/** * @deprecated Use {@link #merge(String, Revision, String, Revision, * String, boolean, int, boolean, * boolean, boolean)} instead. * @since 1.0 */ public void merge(String path1, Revision revision1, String path2, Revision revision2, String localPath, boolean force, boolean recurse) throws ClientException { synchronized(clazz) { worker.merge(path1, revision1, path2, revision2, localPath, force, recurse); } }
/** * @deprecated Use {@link #merge(String, Revision, RevisionRange[], * String, boolean, int, boolean, * boolean, boolean)} instead. * @since 1.2 */ public void merge(String path, Revision pegRevision, Revision revision1, Revision revision2, String localPath, boolean force, boolean recurse, boolean ignoreAncestry, boolean dryRun) throws ClientException { synchronized(clazz) { worker.merge(path, pegRevision, revision1, revision2, localPath, force, recurse, ignoreAncestry, dryRun); } }
/** * @deprecated Use {@link #merge(String, Revision, String, Revision, * String, boolean, int, boolean, * boolean, boolean)} instead. * @since 1.0 */ public void merge(String path1, Revision revision1, String path2, Revision revision2, String localPath, boolean force, boolean recurse) throws ClientException { synchronized(clazz) { worker.merge(path1, revision1, path2, revision2, localPath, force, recurse); } }
/** * @deprecated Use {@link #merge(String, Revision, String, Revision, * String, boolean, int, boolean, * boolean, boolean)} instead. * @since 1.2 */ public void merge(String path1, Revision revision1, String path2, Revision revision2, String localPath, boolean force, boolean recurse, boolean ignoreAncestry, boolean dryRun) throws ClientException { synchronized(clazz) { worker.merge(path1, revision1, path2, revision2, localPath, force, recurse, ignoreAncestry, dryRun); } }
/** * @deprecated Use {@link #merge(String, Revision, String, Revision, * String, boolean, int, boolean, * boolean, boolean)} instead. * @since 1.2 */ public void merge(String path1, Revision revision1, String path2, Revision revision2, String localPath, boolean force, boolean recurse, boolean ignoreAncestry, boolean dryRun) throws ClientException { synchronized(clazz) { worker.merge(path1, revision1, path2, revision2, localPath, force, recurse, ignoreAncestry, dryRun); } }
/** * @deprecated Use {@link #merge(String, Revision, RevisionRange[], * String, boolean, int, boolean, * boolean, boolean)} instead. * @since 1.2 */ public void merge(String path, Revision pegRevision, Revision revision1, Revision revision2, String localPath, boolean force, boolean recurse, boolean ignoreAncestry, boolean dryRun) throws ClientException { synchronized(clazz) { worker.merge(path, pegRevision, revision1, revision2, localPath, force, recurse, ignoreAncestry, dryRun); } }
/** * @since 1.5 */ public native void merge(String path1, Revision revision1, String path2, Revision revision2, String localPath, boolean force, int depth, boolean ignoreAncestry, boolean dryRun, boolean recordOnly) throws ClientException;
/** * @since 1.5 */ public native void merge(String path1, Revision revision1, String path2, Revision revision2, String localPath, boolean force, int depth, boolean ignoreAncestry, boolean dryRun, boolean recordOnly) throws ClientException;
/** * @since 1.5 */ public native void merge(String path, Revision pegRevision, RevisionRange[] revisions, String localPath, boolean force, int depth, boolean ignoreAncestry, boolean dryRun, boolean recordOnly) throws ClientException;
/** * @since 1.5 */ public native void merge(String path, Revision pegRevision, RevisionRange[] revisions, String localPath, boolean force, int depth, boolean ignoreAncestry, boolean dryRun, boolean recordOnly) throws ClientException;