Team System Developer Center >
Visual Studio Team System Forums
>
Team Foundation Server - Version Control
>
Stale Exclusive Lock?
Stale Exclusive Lock?
- I'm trying to perform a baseless merge between two folders in my TFS repository, using the tf command from the Visual Studio Command Prompt. I keep getting an error saying that the destination is locked for check-out by another user. I spoke to the user in question, and he verified that he does not have this folder locked or checked out. The Source Control Explorer inside Visual Studio does not show any pending changes either. I tried the command on two different machines and got the same error. Here is a copy of the text from the command prompt:
c:\Program Files\Microsoft Visual Studio 9.0\VC>tf merge /baseless C:\src\direct2009\Branches\3501-SourceImport\UI\Web C:\src\direct2009\Development\UI\Web The item $/direct2009/Development/UI/Web is locked for check-out by MA\steve in workspace PHDEVCI. The item $/direct2009/Development/UI/Web is locked for check-out by MA\steve in workspace PHDEVCI.
Just in case, I also tried undoing his checkout, using the tf undo command, as specified on this blog . But that did not work either:
c:\Program Files\Microsoft Visual Studio 9.0\VC>tf undo /workspace:PHDEVCI;MA\steve "$/direct2009/Development/UI/Web" No pending changes were found for $/direct2009/Development/UI/Web.
How can I perform this merge?
thanks for any help
Answers
- Thanks for your post, Barretj.
Please have a try of following command:
tf lock /lock:none $/direct2009/Development/UI/Web /recursive
The comamnd is documented at: http://msdn.microsoft.com/en-us/library/47b0c7w9.aspx
If it still doesn't work, you can have a try to delete the workspace if it is not matter.
tf workspace /delete PHDEVCI;MA\steve
From its documentation: http://msdn.microsoft.com/en-us/library/y901w7se.aspx
If you delete a workspace that contains pending changes, Team Foundation cancels the pending changes as part of the delete process. Deleting a workspace does not delete the files and folders on the client computer that were in that workspace.
Hope it helps.
Hongye Sun [MSFT]
MSDN Subscriber Support in Forum
If you have any feedback on our support, please contact msdnmg @ microsoft.com
Please remember to mark the replies as answers if they help and unmark them if they provide no help.
Welcome to the All-In-One Code Framework! If you have any feedback, please tell us.- Marked As Answer byHongye SunMSFT, ModeratorThursday, November 05, 2009 9:00 AM
All Replies
- Thanks for your post, Barretj.
Please have a try of following command:
tf lock /lock:none $/direct2009/Development/UI/Web /recursive
The comamnd is documented at: http://msdn.microsoft.com/en-us/library/47b0c7w9.aspx
If it still doesn't work, you can have a try to delete the workspace if it is not matter.
tf workspace /delete PHDEVCI;MA\steve
From its documentation: http://msdn.microsoft.com/en-us/library/y901w7se.aspx
If you delete a workspace that contains pending changes, Team Foundation cancels the pending changes as part of the delete process. Deleting a workspace does not delete the files and folders on the client computer that were in that workspace.
Hope it helps.
Hongye Sun [MSFT]
MSDN Subscriber Support in Forum
If you have any feedback on our support, please contact msdnmg @ microsoft.com
Please remember to mark the replies as answers if they help and unmark them if they provide no help.
Welcome to the All-In-One Code Framework! If you have any feedback, please tell us.- Marked As Answer byHongye SunMSFT, ModeratorThursday, November 05, 2009 9:00 AM
- Thanks for the suggestions. the tf lock command did not help. I had the user delete his workspace, and that fixed it.
C:\Program Files (x86)\Microsoft Visual Studio 9.0\VC>tf lock /lock:none $/di rect2009/Development/UI/Web /recursive TF10152: The item $/direct2009/Development/UI/Web/DynamicData/Content/Images/ Back.gif must remain locked because its file type prevents multiple check-outs. TF10152: The item $/direct2009/Development/UI/Web/DynamicData/Content/Images/ header_back.gif must remain locked because its file type prevents multiple check -outs. TF10152: The item $/direct2009/Development/UI/Web/DynamicData/Content/Images/ PgFirst.gif must remain locked because its file type prevents multiple check-out s. TF10152: The item $/direct2009/Development/UI/Web/DynamicData/Content/Images/ PgLast.gif must remain locked because its file type prevents multiple check-outs . TF10152: The item $/direct2009/Development/UI/Web/DynamicData/Content/Images/ PgNext.gif must remain locked because its file type prevents multiple check-outs . TF10152: The item $/direct2009/Development/UI/Web/DynamicData/Content/Images/ PgPrev.gif must remain locked because its file type prevents multiple check-outs . TF10152: The item $/direct2009/Development/UI/Web/DynamicData/Content/Images/ plus.gif must remain locked because its file type prevents multiple check-outs. TF10152: The item $/direct2009/Development/UI/Web/ui/img/add.png must remain locked because its file type prevents multiple check-outs. TF10152: The item $/direct2009/Development/UI/Web/ui/img/bg-header.png must r emain locked because its file type prevents multiple check-outs. TF10152: The item $/direct2009/Development/UI/Web/ui/img/bg-step-number.png m ust remain locked because its file type prevents multiple check-outs. TF10152: The item $/direct2009/Development/UI/Web/ui/img/bg-tree.png must rem ain locked because its file type prevents multiple check-outs. TF10152: The item $/direct2009/Development/UI/Web/ui/img/btn-expand-collapse. png must remain locked because its file type prevents multiple check-outs. TF10152: The item $/direct2009/Development/UI/Web/ui/img/db.png must remain l ocked because its file type prevents multiple check-outs. TF10152: The item $/direct2009/Development/UI/Web/ui/img/delete.png must rema in locked because its file type prevents multiple check-outs. TF10152: The item $/direct2009/Development/UI/Web/ui/img/down.png must remain locked because its file type prevents multiple check-outs. TF10152: The item $/direct2009/Development/UI/Web/ui/img/edit.png must remain locked because its file type prevents multiple check-outs. TF10152: The item $/direct2009/Development/UI/Web/ui/img/EditInformationHS.pn g must remain locked because its file type prevents multiple check-outs. TF10152: The item $/direct2009/Development/UI/Web/ui/img/filter-disabled.gif must remain locked because its file type prevents multiple check-outs. TF10152: The item $/direct2009/Development/UI/Web/ui/img/filter-enabled.gif m ust remain locked because its file type prevents multiple check-outs. TF10152: The item $/direct2009/Development/UI/Web/ui/img/invalid.png must rem ain locked because its file type prevents multiple check-outs. TF10152: The item $/direct2009/Development/UI/Web/ui/img/loading.gif must rem ain locked because its file type prevents multiple check-outs. TF10152: The item $/direct2009/Development/UI/Web/ui/img/logo.png must remain locked because its file type prevents multiple check-outs. TF10152: The item $/direct2009/Development/UI/Web/ui/img/play.png must remain locked because its file type prevents multiple check-outs. TF10152: The item $/direct2009/Development/UI/Web/ui/img/status-loading.gif m ust remain locked because its file type prevents multiple check-outs. TF10152: The item $/direct2009/Development/UI/Web/ui/img/up.png must remain l ocked because its file type prevents multiple check-outs. TF10152: The item $/direct2009/Development/UI/Web/ui/img/valid.png must remai n locked because its file type prevents multiple check-outs. TF10152: The item $/direct2009/Development/UI/Web/ui/js/ajax-loader.gif must remain locked because its file type prevents multiple check-outs.


