Set-Merge

Introduction

Le cdmlet Set-Merge permet de fusionner deux branches entre elles.

La récupération d'un serveur TFS ce fait grâce au CmdLet Get-TFS.

Paramètres

Nom Description Exemple
-tfs Serveur TFS récupérer avec Get-TFS $tfs = Get-TFS -url http://colmar:8080
-projectName Nom du projet
-source Branche source $/test/dev
-target Branche destination $/test/main
-description Description pour de la fusion
-RecursionType Type de récursion (Full, OneLevel, None)
-mergeoption Option pour le merge (AlwaysAcceptMine, Baseless, ForceMerge, NoMerge, None

Exemple

========================================================
Windows PowerShell
PowerShell for Team System
By Noham Choulant http://choulant.blogspot.com
========================================================

PsTFS > : $tfs = tfs colmar

PsTFS > : Set-Merge -TFS $tfs -ProjectName MyDemo -Source $/MyDemo/Main -Target $/MyDemo/Dev -Description "Merge Main Dev" -RecursionType Full -MergeO
ptions None
Getting: c:\temp\MergeTFSPsTFS\Target, status: Getting
Getting: c:\temp\MergeTFSPsTFS\Source, status: Getting
Getting: c:\temp\MergeTFSPsTFS\Target\All Tasks.wiq, status: Getting
Getting: c:\temp\MergeTFSPsTFS\Target\MyHost.cs, status: Getting
Getting: c:\temp\MergeTFSPsTFS\Target\TemplateStorageMetadata.xml, status: Getting
Getting: c:\temp\MergeTFSPsTFS\Target\WebPart1.cs, status: Getting
Getting: c:\temp\MergeTFSPsTFS\Source\All Tasks.wiq, status: Getting
Getting: c:\temp\MergeTFSPsTFS\Source\MyHost.cs, status: Getting
Getting: c:\temp\MergeTFSPsTFS\Source\readme.html, status: Getting
Getting: c:\temp\MergeTFSPsTFS\Source\TemplateStorageMetadata.xml, status: Getting
Getting: c:\temp\MergeTFSPsTFS\Source\WebPart1.cs, status: Getting
Number conflicts : 0
Number failures : 0
Number operations : 1
Number warnings : 0

---------------------------------------------------------

Your current pending changes:
  path: c:\temp\MergeTFSPsTFS\Target\readme.html, change: merge, branch
Checking in c:\temp\MergeTFSPsTFS\Target\readme.html

Checked in changeset 36
Get-TFSMerge is end

Last edited Jan 12, 2009 at 9:16 AM by pc152, version 2

Comments

No comments yet.