Repository: maven-scm Updated Branches: refs/heads/master 1b77b4306 -> a678671dc
[SCM-759] cannot create Branch with TFS-provider Project: http://git-wip-us.apache.org/repos/asf/maven-scm/repo Commit: http://git-wip-us.apache.org/repos/asf/maven-scm/commit/a678671d Tree: http://git-wip-us.apache.org/repos/asf/maven-scm/tree/a678671d Diff: http://git-wip-us.apache.org/repos/asf/maven-scm/diff/a678671d Branch: refs/heads/master Commit: a678671dc7dc8d8546cc45b9f32997fbd1903b3d Parents: 1b77b43 Author: OhadR <ohadr.develo...@gmail.com> Authored: Mon Jun 23 17:18:45 2014 +0300 Committer: Hervé Boutemy <hbout...@apache.org> Committed: Tue Jul 22 21:38:58 2014 +0200 ---------------------------------------------------------------------- .../maven/scm/provider/tfs/command/TfsBranchCommand.java | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/maven-scm/blob/a678671d/maven-scm-providers/maven-scm-provider-tfs/src/main/java/org/apache/maven/scm/provider/tfs/command/TfsBranchCommand.java ---------------------------------------------------------------------- diff --git a/maven-scm-providers/maven-scm-provider-tfs/src/main/java/org/apache/maven/scm/provider/tfs/command/TfsBranchCommand.java b/maven-scm-providers/maven-scm-provider-tfs/src/main/java/org/apache/maven/scm/provider/tfs/command/TfsBranchCommand.java index 2d2db9b..bdb94d1 100644 --- a/maven-scm-providers/maven-scm-provider-tfs/src/main/java/org/apache/maven/scm/provider/tfs/command/TfsBranchCommand.java +++ b/maven-scm-providers/maven-scm-provider-tfs/src/main/java/org/apache/maven/scm/provider/tfs/command/TfsBranchCommand.java @@ -28,6 +28,7 @@ import org.apache.maven.scm.ScmResult; import org.apache.maven.scm.command.branch.AbstractBranchCommand; import org.apache.maven.scm.command.branch.BranchScmResult; import org.apache.maven.scm.provider.ScmProviderRepository; +import org.apache.maven.scm.provider.tfs.TfsScmProviderRepository; import org.apache.maven.scm.provider.tfs.command.consumer.ErrorStreamConsumer; import org.codehaus.plexus.util.cli.CommandLineUtils.StringStreamConsumer; @@ -42,6 +43,7 @@ public class TfsBranchCommand StringStreamConsumer out = new StringStreamConsumer(); ErrorStreamConsumer err = new ErrorStreamConsumer(); int status = command.execute( out, err ); + getLogger().info( "status of branch command is= " + status + "; err= " + err.getOutput() ); if ( status != 0 || err.hasBeenFed() ) { return new BranchScmResult( command.getCommandString(), "Error code for TFS branch command - " + status, @@ -53,7 +55,13 @@ public class TfsBranchCommand public TfsCommand createCommand( ScmProviderRepository r, ScmFileSet f, String branch ) { TfsCommand command = new TfsCommand( "branch", r, f, getLogger() ); - command.addArgument( f.getBasedir().getAbsolutePath() ); + + //SCM-759 + //command.addArgument( f.getBasedir().getAbsolutePath() ); + String serverPath = ( (TfsScmProviderRepository) r ).getServerPath(); + command.addArgument( serverPath ); + + command.addArgument( "-checkin" ); command.addArgument( branch ); return command;
