• 如果您觉得本站非常有看点,那么赶紧使用Ctrl+D 收藏吧

Java SVNRevisionRange类的典型用法和代码示例

java 1次浏览

本文整理汇总了Java中org.tigris.subversion.svnclientadapter.SVNRevisionRange的典型用法代码示例。如果您正苦于以下问题:Java SVNRevisionRange类的具体用法?Java SVNRevisionRange怎么用?Java SVNRevisionRange使用的例子?那么恭喜您, 这里精选的类代码示例或许可以为您提供帮助。

SVNRevisionRange类属于org.tigris.subversion.svnclientadapter包,在下文中一共展示了SVNRevisionRange类的21个代码示例,这些例子默认根据受欢迎程度排序。您可以为喜欢或者感觉有用的代码点赞,您的评价将有助于我们的系统推荐出更棒的Java代码示例。

示例1: rollback

点赞 3

import org.tigris.subversion.svnclientadapter.SVNRevisionRange; //导入依赖的package包/类
@Override
public boolean rollback( String name ) {
  if ( !isClean() ) {
    showMessageBox( BaseMessages.getString( PKG, "Dialog.Error" ), "Dirty working-tree" );
    return false;
  }
  try {
    svnClient.merge( new SVNUrl( getRemote() ),
        null,
        new SVNRevisionRange[] { new SVNRevisionRange(
            svnClient.getInfoFromWorkingCopy( root ).getRevision(),
            new SVNRevision.Number( Long.parseLong( name ) )
            ) },
        root,
        false, 100, true, false, false );
    return true;
  } catch ( Exception e ) {
    showMessageBox( BaseMessages.getString( PKG, "Dialog.Error" ), e.getMessage() );
  }
  return false;
}
 

开发者ID:HiromuHota,
项目名称:pdi-git-plugin,
代码行数:22,
代码来源:SVN.java

示例2: performMerge

点赞 3

import org.tigris.subversion.svnclientadapter.SVNRevisionRange; //导入依赖的package包/类
public boolean performMerge(MergeWizardMainPage mainPage, MergeWizardLastPage optionsPage, IWorkbenchPart targetPart) {		
	IResource[] resources = standardPage.getResources();
	
	SVNRevisionRange[] revisions = null;	
	revisions = revisionsPage.getRevisions();

	MergeOperation mergeOperation = new MergeOperation(targetPart, resources, standardPage.getUrls(), null, standardPage.getUrls(), null, revisions, null);		
	mergeOperation.setRecordOnly(true);
	mergeOperation.setUnblock(true);
	try {
		mergeOperation.run();
	} catch (Exception e) {
		Activator.handleError(Messages.UnblockMergeInputProvider_error, e);
		MessageDialog.openError(Display.getCurrent().getActiveShell(), Messages.UnblockMergeInputProvider_merge, e.getMessage());
		return false;
	}
	
	return true;
}
 

开发者ID:subclipse,
项目名称:subclipse,
代码行数:20,
代码来源:UnblockMergeInputProvider.java

示例3: MergeOperation

点赞 2

import org.tigris.subversion.svnclientadapter.SVNRevisionRange; //导入依赖的package包/类
public MergeOperation(IWorkbenchPart part, IResource[] resources, SVNUrl[] svnUrls1, SVNRevision svnRevision1, SVNUrl[] svnUrls2, SVNRevision svnRevision2, SVNRevisionRange[] revisions, MergeOutput mergeOutput) {
	super(part);
    mergedResources = resources;
    this.svnUrls1 = svnUrls1;
    this.svnRevision1 = svnRevision1;
    this.svnUrls2 = svnUrls2;
    this.svnRevision2 = svnRevision2;  
    this.revisions = revisions;
    this.mergeOutput = mergeOutput;
    if (mergeOutput != null) resumed = true;
}
 

开发者ID:subclipse,
项目名称:subclipse,
代码行数:12,
代码来源:MergeOperation.java

示例4: setRevisions

点赞 2

import org.tigris.subversion.svnclientadapter.SVNRevisionRange; //导入依赖的package包/类
public void setRevisions(String revisions) {
	ArrayList revisionsList = new ArrayList();
	String[] ranges = revisions.split(","); //$NON-NLS-1$
	for (int i = 0; i < ranges.length; i++) revisionsList.add(new SVNRevisionRange(ranges[i]));
	SVNRevisionRange[] revisionsArray = new SVNRevisionRange[revisionsList.size()];
	revisionsList.toArray(revisionsArray);
	setRevisions(revisionsArray);
}
 

开发者ID:subclipse,
项目名称:subclipse,
代码行数:9,
代码来源:MergeOptions.java

示例5: MergeCommand

点赞 2

import org.tigris.subversion.svnclientadapter.SVNRevisionRange; //导入依赖的package包/类
public MergeCommand(IResource resource, SVNUrl svnUrl1, SVNRevision svnRevision1, SVNUrl svnUrl2, SVNRevision svnRevision2, SVNRevisionRange[] revisions, MergeOutput mergeOutput) {    	
    super();
    this.resource = resource;
    this.svnUrl1 = svnUrl1;
    this.svnRevision1 = svnRevision1;
    this.svnUrl2 = svnUrl2;
    this.svnRevision2 = svnRevision2;
    this.revisions = revisions;
    this.mergeOutput = mergeOutput;
}
 

开发者ID:subclipse,
项目名称:subclipse,
代码行数:11,
代码来源:MergeCommand.java

示例6: getRevisions

点赞 2

import org.tigris.subversion.svnclientadapter.SVNRevisionRange; //导入依赖的package包/类
public SVNRevisionRange[] getRevisions() {
	SVNRevisionRange[] revisionRanges = SVNRevisionRange.getRevisions(getSelectedRevisions(), getAll());
	SVNRevisionRange[] reversedRevisionRanges = new SVNRevisionRange[revisionRanges.length];
	for (int i = 0; i < revisionRanges.length; i++) {
		reversedRevisionRanges[i] = new SVNRevisionRange(revisionRanges[i].getToRevision(), revisionRanges[i].getFromRevision());
	}
	return reversedRevisionRanges;
}
 

开发者ID:subclipse,
项目名称:subclipse,
代码行数:9,
代码来源:MergeWizardUnblockRevisionsPage.java

示例7: convertRevisionRange

点赞 2

import org.tigris.subversion.svnclientadapter.SVNRevisionRange; //导入依赖的package包/类
public static SVNRevisionRange[] convertRevisionRange(List<RevisionRange> jhlRange) {
       SVNRevisionRange[] range = new SVNRevisionRange[jhlRange.size()];
       int i=0;
       for (RevisionRange item : jhlRange) {
		range[i] = JhlConverter.convert(item);
		i++;
	}
       return range;
}
 

开发者ID:subclipse,
项目名称:svnclientadapter,
代码行数:10,
代码来源:JhlConverter.java

示例8: convert

点赞 2

import org.tigris.subversion.svnclientadapter.SVNRevisionRange; //导入依赖的package包/类
public static  List<RevisionRange> convert(SVNRevisionRange[] range) {
    List<RevisionRange> jhlRange = new ArrayList<RevisionRange>(range.length);
    for(int i=0; i < range.length; i++) {
        jhlRange.add(JhlConverter.convert(range[i]));
    }
    return jhlRange;
}
 

开发者ID:subclipse,
项目名称:svnclientadapter,
代码行数:8,
代码来源:JhlConverter.java

示例9: merge

点赞 2

import org.tigris.subversion.svnclientadapter.SVNRevisionRange; //导入依赖的package包/类
public void merge(SVNUrl url, SVNRevision pegRevision,
		SVNRevisionRange[] revisions, File localPath, boolean force,
		int depth, boolean ignoreAncestry, boolean dryRun,
		boolean recordOnly) throws SVNClientException {
	// TODO Auto-generated method stub
	notImplementedYet();
	
}
 

开发者ID:subclipse,
项目名称:svnclientadapter,
代码行数:9,
代码来源:CmdLineClientAdapter.java

示例10: merge

点赞 2

import org.tigris.subversion.svnclientadapter.SVNRevisionRange; //导入依赖的package包/类
@Override
public void merge(SVNUrl arg0, SVNRevision arg1, SVNRevisionRange[] arg2, File arg3, boolean arg4, int arg5, boolean arg6, boolean arg7, boolean arg8) throws SVNClientException {
    throw new UnsupportedOperationException("Not supported yet.");
}
 

开发者ID:apache,
项目名称:incubator-netbeans,
代码行数:5,
代码来源:CommandlineClient.java

示例11: getRevisions

点赞 2

import org.tigris.subversion.svnclientadapter.SVNRevisionRange; //导入依赖的package包/类
public SVNRevisionRange[] getRevisions() {
	return revisions;
}
 

开发者ID:subclipse,
项目名称:subclipse,
代码行数:4,
代码来源:MergeOptions.java

示例12: performMerge

点赞 2

import org.tigris.subversion.svnclientadapter.SVNRevisionRange; //导入依赖的package包/类
public boolean performMerge(MergeWizardMainPage mainPage, MergeWizardLastPage optionsPage, IWorkbenchPart targetPart) {		
	
	String commonRoot = standardPage.getCommonRoot(false);
	String mergeFrom = standardPage.getMergeFrom();
	Activator.getDefault().saveMergeSource(mergeFrom, commonRoot);
	
	IResource[] resources = standardPage.getResources();
	SVNUrl[] urls = standardPage.getUrls();

	
	SVNRevisionRange[] revisions = null;
	if (standardPage.selectRevisions())
	{
		Set<IResource> usedResources = new HashSet<IResource>();

		Map<SVNRevision.Number,List<IResource>>  map = revisionsPage.getRevisionToResource();
		revisions = revisionsPage.getRevisions();
		CommentsManager commentsManager = SVNUIPlugin.getPlugin().getRepositoryManager().getCommentsManager();
		ILogEntry[] entries = revisionsPage.getSelectedLogEntries();
		for (int i = 0; i < entries.length; i++) {
			commentsManager.addComment(entries[i].getComment());
			if (map.size() > 0)
			{
				List<IResource> lst = map.get(entries[i].getRevision());
				usedResources.addAll(lst);
			}
		}
		// only filter the urls if the usedResources does have content.
		if (usedResources.size() > 0) {
			List<SVNUrl> urlsList = new ArrayList<SVNUrl>();
			List<IResource> resourcesList = new ArrayList<IResource>();

			for (int i = 0; i < resources.length; i++) {
				if (usedResources.contains(resources[i])) {
					urlsList.add(urls[i]);
					resourcesList.add(resources[i]);
				}
			}
			resources = resourcesList
					.toArray(new IResource[resourcesList.size()]);
			urls = urlsList.toArray(new SVNUrl[urlsList.size()]);
		}
	}

	MergeOperation mergeOperation = new MergeOperation(targetPart, resources, urls, null, urls, null, revisions, null);		
	mergeOperation.setForce(optionsPage.isForce());
	mergeOperation.setIgnoreAncestry(optionsPage.isIgnore());
	mergeOperation.setDepth(optionsPage.getDepth());
	mergeOperation.setTextConflictHandling(optionsPage.getTextConflictHandling());
	mergeOperation.setBinaryConflictHandling(optionsPage.getBinaryConflictHandling());		
	mergeOperation.setPropertyConflictHandling(optionsPage.getPropertyConflictHandling());
	mergeOperation.setTreeConflictHandling(optionsPage.getTreeConflictHandling());
	try {
		mergeOperation.run();
	} catch (Exception e) {
		Activator.handleError(Messages.StandardMergeInputProvider_error, e);
		MessageDialog.openError(Display.getCurrent().getActiveShell(), Messages.StandardMergeInputProvider_merge, e.getMessage());
		return false;
	}
	
	return true;
}
 

开发者ID:subclipse,
项目名称:subclipse,
代码行数:63,
代码来源:StandardMergeInputProvider.java

示例13: toString

点赞 2

import org.tigris.subversion.svnclientadapter.SVNRevisionRange; //导入依赖的package包/类
public String toString() {
	
	if (resource == null) return super.toString();
	
	StringBuffer stringBuffer = new StringBuffer();
	if (abnormalEnd) stringBuffer.append(":abnormalEnd:"+ System.getProperty("line.separator")); //$NON-NLS-1$ //$NON-NLS-2$
	if (normalEnd) stringBuffer.append(":normalEnd:"+ System.getProperty("line.separator")); //$NON-NLS-1$ //$NON-NLS-2$
	if (incomplete) stringBuffer.append(":incomplete:"+ System.getProperty("line.separator")); //$NON-NLS-1$ //$NON-NLS-2$
	if (description != null) stringBuffer.append("description: " + description + System.getProperty("line.separator")); //$NON-NLS-1$ //$NON-NLS-2$
	if (resource.getType() == IResource.PROJECT) stringBuffer.append("project: " + resource.getFullPath().toOSString() + System.getProperty("line.separator")); //$NON-NLS-1$ //$NON-NLS-2$
	else if (resource.getType() == IResource.FOLDER) stringBuffer.append("folder: " + resource.getFullPath().toOSString() + System.getProperty("line.separator")); //$NON-NLS-1$ //$NON-NLS-2$
	else if (resource.getType() == IResource.FILE) stringBuffer.append("file: " + resource.getFullPath().toOSString() + System.getProperty("line.separator")); //$NON-NLS-1$ //$NON-NLS-2$
	if (mergeOptions != null) {
		if (mergeOptions.getFromUrl() != null) stringBuffer.append("fromUrl: " + mergeOptions.getFromUrl().toString() + System.getProperty("line.separator")); //$NON-NLS-1$ //$NON-NLS-2$
		if (mergeOptions.getFromRevision() != null) stringBuffer.append("fromRevision: " + mergeOptions.getFromRevision() + System.getProperty("line.separator")); //$NON-NLS-1$ //$NON-NLS-2$
		if (mergeOptions.getToUrl() != null) stringBuffer.append("toUrl: " + mergeOptions.getToUrl().toString() + System.getProperty("line.separator")); //$NON-NLS-1$ //$NON-NLS-2$
		if (mergeOptions.getToRevision() != null) stringBuffer.append("toRevision: " + mergeOptions.getToRevision() + System.getProperty("line.separator")); //$NON-NLS-1$ //$NON-NLS-2$
		if (mergeOptions.getRevisions() != null) {
			stringBuffer.append("revisionRanges: "); //$NON-NLS-1$
			SVNRevisionRange[] revisionRanges = mergeOptions.getRevisions();
			for (int i = 0; i < revisionRanges.length; i++) {
				if (i > 0) stringBuffer.append(","); //$NON-NLS-1$
				stringBuffer.append(revisionRanges[i].toString());
			}
			stringBuffer.append(System.getProperty("line.separator")); //$NON-NLS-1$
		}
		stringBuffer.append("force: " + mergeOptions.isForce() + System.getProperty("line.separator")); //$NON-NLS-1$ //$NON-NLS-2$
		stringBuffer.append("recurse: " + mergeOptions.isRecurse() + System.getProperty("line.separator")); //$NON-NLS-1$ //$NON-NLS-2$
		stringBuffer.append("ignore: " + mergeOptions.isIgnoreAncestry() + System.getProperty("line.separator")); //$NON-NLS-1$ //$NON-NLS-2$
		stringBuffer.append("depth: " + mergeOptions.getDepth() + System.getProperty("line.separator")); //$NON-NLS-1$ //$NON-NLS-2$
	    if (mergeOptions.getRevisions()!= null && mergeOptions.getRevisions().length > 0) {
	    	stringBuffer.append("revisions: "); //$NON-NLS-1$
	    	SVNRevisionRange[] revisions = mergeOptions.getRevisions();
	    	for (int i = 0; i < revisions.length; i++) {
	    		if (i > 0) stringBuffer.append(","); //$NON-NLS-1$
	    		stringBuffer.append(revisions[i].toString());
	    	}
	    	stringBuffer.append(System.getProperty("line.separator")); //$NON-NLS-1$    
	    }
	}
	if (mergeSummaryResults != null) {
		for (int i = 0; i < mergeSummaryResults.length; i++) stringBuffer.append(mergeSummaryResults[i] + System.getProperty("line.separator")); //$NON-NLS-1$
		stringBuffer.append(System.getProperty("line.separator")); //$NON-NLS-1$		
	}
	if (workspaceUrl != null) stringBuffer.append("workspaceUrl: " + workspaceUrl + System.getProperty("line.separator")); //$NON-NLS-1$ //$NON-NLS-2$
	stringBuffer.append("workspaceRevision: " + workspaceRevision + System.getProperty("line.separator")); //$NON-NLS-1$ //$NON-NLS-2$
	stringBuffer.append("lowerRevision: " + lowerRevision + System.getProperty("line.separator")); //$NON-NLS-1$ //$NON-NLS-2$
	stringBuffer.append("upperRevision: " + upperRevision + System.getProperty("line.separator")); //$NON-NLS-1$ //$NON-NLS-2$
	stringBuffer.append(mergeCommand);
	if (mergeResults != null) {
		for (int i = 0; i < mergeResults.length; i++)
			stringBuffer.append(System.getProperty("line.separator") + mergeResults[i]); //$NON-NLS-1$
	}
	return stringBuffer.toString();
}
 

开发者ID:subclipse,
项目名称:subclipse,
代码行数:56,
代码来源:MergeOutput.java

示例14: performMerge

点赞 2

import org.tigris.subversion.svnclientadapter.SVNRevisionRange; //导入依赖的package包/类
public boolean performMerge(MergeWizardMainPage mainPage, MergeWizardLastPage optionsPage, IWorkbenchPart targetPart) {		
	IResource[] resources = standardPage.getResources();
	SVNUrl[] urls = standardPage.getUrls();
	
	SVNRevisionRange[] revisions = revisionsPage.getRevisions();	

	Set<IResource> usedResources = new HashSet<IResource>();
	Map<SVNRevision.Number, List<IResource>> map = revisionsPage
			.getRevisionToResource();
	if (map.size() > 0) {
		ILogEntry[] entries = revisionsPage.getSelectedLogEntries();
		for (int i = 0; i < entries.length; i++) {
			List<IResource> lst = map.get(entries[i].getRevision());
			usedResources.addAll(lst);
		}
		// only filter the urls if the usedResources does have content.
		if (usedResources.size() > 0) {
			List<SVNUrl> urlsList = new ArrayList<SVNUrl>();
			List<IResource> resourcesList = new ArrayList<IResource>();
			
			for (int i = 0; i < resources.length; i++) {
				if (usedResources.contains(resources[i])) {
					urlsList.add(urls[i]);
					resourcesList.add(resources[i]);
				}
			}
			resources = resourcesList
			.toArray(new IResource[resourcesList.size()]);
			urls = urlsList.toArray(new SVNUrl[urlsList.size()]);
		}
	}
	
	MergeOperation mergeOperation = new MergeOperation(targetPart, resources, urls, null, urls, null, revisions, null);		
	mergeOperation.setRecordOnly(true);
	try {
		mergeOperation.run();
	} catch (Exception e) {
		Activator.handleError(Messages.BlockMergeInputProvider_error, e);
		MessageDialog.openError(Display.getCurrent().getActiveShell(), Messages.BlockMergeInputProvider_merge, e.getMessage());
		return false;
	}
	
	return true;
}
 

开发者ID:subclipse,
项目名称:subclipse,
代码行数:45,
代码来源:BlockMergeInputProvider.java

示例15: getRevisions

点赞 2

import org.tigris.subversion.svnclientadapter.SVNRevisionRange; //导入依赖的package包/类
public SVNRevisionRange[] getRevisions() {
	return SVNRevisionRange.getRevisions(getSelectedRevisions(), getAllRevisions());
}
 

开发者ID:subclipse,
项目名称:subclipse,
代码行数:4,
代码来源:MergeWizardRevisionsPage.java

示例16: merge

点赞 2

import org.tigris.subversion.svnclientadapter.SVNRevisionRange; //导入依赖的package包/类
public void merge(SVNUrl url, SVNRevision pegRevision, SVNRevisionRange[] revisions, File localPath, boolean force, int depth, boolean ignoreAncestry, boolean dryRun, boolean recordOnly) throws SVNClientException {
   	try {
           notificationHandler.setCommand(ISVNNotifyListener.Command.MERGE);

           String target = fileToSVNPath(localPath, false);
           String commandLine = "merge";
           if (dryRun) {
           	commandLine += " --dry-run";
           }
           Depth d = JhlConverter.depth(depth);
           commandLine += depthCommandLine(d);
           if (force) {
           	commandLine += " --force";
           }
           if (ignoreAncestry) {
           	commandLine += " --ignore-ancestry";
           }
           List<RevisionRange> range = JhlConverter.convert(revisions);
           for (int i = 0; i < revisions.length; i++) {
			commandLine += " " + revisions[i].toMergeString();
		}
           commandLine += " " + url.toString();
           
           commandLine += " " + target;
           notificationHandler.logCommandLine(commandLine);
           File baseDir = SVNBaseDir.getBaseDir(localPath);
           notificationHandler.setBaseDir(baseDir);
       	Revision peg = JhlConverter.convert(pegRevision);
       	if (peg == null) peg = Revision.HEAD;
       	svnClient.merge(url.toString(), peg, range, target, force, d, ignoreAncestry, dryRun, recordOnly);
           if (dryRun)
               notificationHandler.logCompleted("Dry-run merge complete.");
           else
               notificationHandler.logCompleted("Merge complete.");
       } catch (ClientException e) {
           notificationHandler.logException(e);
           if (dryRun)
               notificationHandler.logCompleted("Dry-run merge completed abnormally.");
           else
               notificationHandler.logCompleted("Merge completed abnormally.");
           SVNClientException svnClientException = new SVNClientException(e);
           svnClientException.setAprError(e.getAprError());
           throw svnClientException;          
       }        
}
 

开发者ID:subclipse,
项目名称:svnclientadapter,
代码行数:46,
代码来源:AbstractJhlClientAdapter.java

示例17: addRevisionRange

点赞 2

import org.tigris.subversion.svnclientadapter.SVNRevisionRange; //导入依赖的package包/类
public void addRevisionRange(String path, SVNRevisionRange range) {
	if (info == null)
		info = new Mergeinfo();
	info.addRevisionRange(path, JhlConverter.convert(range));
}
 

开发者ID:subclipse,
项目名称:svnclientadapter,
代码行数:6,
代码来源:JhlMergeInfo.java

示例18: addRevisions

点赞 2

import org.tigris.subversion.svnclientadapter.SVNRevisionRange; //导入依赖的package包/类
public void addRevisions(String path, SVNRevisionRange[] range) {
	if (info == null)
		info = new Mergeinfo();
	info.addRevisions(path, JhlConverter.convert(range));
}
 

开发者ID:subclipse,
项目名称:svnclientadapter,
代码行数:6,
代码来源:JhlMergeInfo.java

示例19: getRevisionRange

点赞 2

import org.tigris.subversion.svnclientadapter.SVNRevisionRange; //导入依赖的package包/类
public SVNRevisionRange[] getRevisionRange(String path) {
	if (info == null)
		return null;
	return JhlConverter.convertRevisionRange(info.getRevisionRange(path));
}
 

开发者ID:subclipse,
项目名称:svnclientadapter,
代码行数:6,
代码来源:JhlMergeInfo.java

示例20: getRevisions

点赞 2

import org.tigris.subversion.svnclientadapter.SVNRevisionRange; //导入依赖的package包/类
public SVNRevisionRange[] getRevisions(String path) {
	if (info == null)
		return null;
	return JhlConverter.convertRevisionRange(info.getRevisions(path));
}
 

开发者ID:subclipse,
项目名称:svnclientadapter,
代码行数:6,
代码来源:JhlMergeInfo.java

示例21: merge

点赞 2

import org.tigris.subversion.svnclientadapter.SVNRevisionRange; //导入依赖的package包/类
public void merge(SVNUrl url, SVNRevision pegRevision,
		SVNRevisionRange[] revisions, File localPath, boolean force,
		int depth, boolean ignoreAncestry, boolean dryRun,
		boolean recordOnly) throws SVNClientException {
	try {
		notificationHandler.setCommand(ISVNNotifyListener.Command.MERGE);

		String target = fileToSVNPath(localPath, false);
		String commandLine = "merge";
		if (dryRun) {
			commandLine += " --dry-run";
		}
		Depth d = JhlConverter.depth(depth);
		commandLine += depthCommandLine(d);
		if (force) {
			commandLine += " --force";
		}
		if (ignoreAncestry) {
			commandLine += " --ignore-ancestry";
		}
		List<RevisionRange> range = JhlConverter.convert(revisions);
		for (int i = 0; i < revisions.length; i++) {
			commandLine += " " + revisions[i].toMergeString();
		}
		commandLine += " " + url.toString();

		commandLine += " " + target;
		notificationHandler.logCommandLine(commandLine);
		File baseDir = SVNBaseDir.getBaseDir(localPath);
		notificationHandler.setBaseDir(baseDir);
		Revision peg = JhlConverter.convert(pegRevision);
		if (peg == null)
			peg = Revision.HEAD;
		svnClient.merge(url.toString(), peg, range, target, force, d,
				ignoreAncestry, dryRun, recordOnly);
		if (dryRun)
			notificationHandler.logCompleted("Dry-run merge complete.");
		else
			notificationHandler.logCompleted("Merge complete.");
	} catch (ClientException e) {
		notificationHandler.logException(e);
		if (dryRun)
			notificationHandler
					.logCompleted("Dry-run merge completed abnormally.");
		else
			notificationHandler.logCompleted("Merge completed abnormally.");
		SVNClientException svnClientException = new SVNClientException(e);
		svnClientException.setAprError(e.getAprError());
		throw svnClientException;
	}
}
 

开发者ID:apicloudcom,
项目名称:APICloud-Studio,
代码行数:52,
代码来源:AbstractJhlClientAdapter.java


版权声明:本文转自网络文章,转载此文章仅为分享知识,如有侵权,请联系管理员进行删除。
喜欢 (0)