How to unshelve a shelveset into another branch with TFS
2014-05-21 19:33
381 查看
/*Author : Jiangong SUN*/
If you have made a shelve in one branch, and want to unshelve it to another branch. This article will be helpful for you.
There are some steps to follow:
1. You need to install TFS Power tools in your machine. Or else, you can't use tfpt command.
2. You need to ensure there is no pending changes in all branches in the workspace.
If not, you may get possible errors like:
- Unable to determine the workspace
- An item with the same key has already been added
3. And it's better to delete cache in TFS: C:\Users[USERNAME]\AppData\Local\Microsoft\Team Foundation\4.0\Cache
4. Go to the target branch name
Example :
c:\>d:
d:\>cd D:\wks\XXX\LOCAL_TARGET_BRANCH
5. Run tfpt unshelve command in target branch mapped directory
Example:
D:\wks\XXX\LOCAL_TARGET_BRANCH>tfpt unshelve /migrate "SourceBranchShelveName" /source:"$/PATH/SOURCE_BRANCH" /target:"$/PATH/TARGET_BRANCH"
6. Resolve conflicts
There may have some conflicts in the unselve, you can choose auto merge all or resolve the conflicts one by one.
Hope this helps! Enjoy coding!
References:
http://geekswithblogs.net/TarunArora/archive/2011/06/06/unshelve-shelveset-created-from-one-branch-to-another.aspx http://benjii.me/2014/04/move-shelveset-to-different-branch-in-tfs/
If you have made a shelve in one branch, and want to unshelve it to another branch. This article will be helpful for you.
There are some steps to follow:
1. You need to install TFS Power tools in your machine. Or else, you can't use tfpt command.
2. You need to ensure there is no pending changes in all branches in the workspace.
If not, you may get possible errors like:
- Unable to determine the workspace
- An item with the same key has already been added
3. And it's better to delete cache in TFS: C:\Users[USERNAME]\AppData\Local\Microsoft\Team Foundation\4.0\Cache
4. Go to the target branch name
Example :
c:\>d:
d:\>cd D:\wks\XXX\LOCAL_TARGET_BRANCH
5. Run tfpt unshelve command in target branch mapped directory
Example:
D:\wks\XXX\LOCAL_TARGET_BRANCH>tfpt unshelve /migrate "SourceBranchShelveName" /source:"$/PATH/SOURCE_BRANCH" /target:"$/PATH/TARGET_BRANCH"
6. Resolve conflicts
There may have some conflicts in the unselve, you can choose auto merge all or resolve the conflicts one by one.
Hope this helps! Enjoy coding!
References:
http://geekswithblogs.net/TarunArora/archive/2011/06/06/unshelve-shelveset-created-from-one-branch-to-another.aspx http://benjii.me/2014/04/move-shelveset-to-different-branch-in-tfs/
相关文章推荐
- How to import existing projects into TFS Visual Studio with GIT ?
- How to import LDIF file into LDAP server with command line
- How to Build Office Developer Tools Projects with TFS Team Build 2012
- How to get the password text in a text with password property from another process using C++ - 用C++如何从不同进程获取密码框文本
- How to sort an array of hashes into hashes with multiple values for a key?
- How to copy values of an array into another array
- JS. How to replace html element with another element/text, represented in string?
- How to export/import data with LOB type from one user/schema to another
- Ruby, how to shuffle one array into another
- How to load large files safely into InnoDB with LOAD DATA INFILE
- [tfs] How to add report builder into report site
- How to import existing GIT repository into another?
- How to use passwords securely with wget
- Sharing Files with NFC ->Sending Files to Another Device
- How to mount partition with ntfs file system and read write access
- How to Consistently Come Up with Great Ideas
- How to open another page in HTML5 Builder Server Mobile Application
- How to console into your devices
- How to load 3d model from different domain and display it with Three.js
- How to config Eclipse with Cucumber