I am using the TFS Integration Plugin, as the built in TFS Connection somehow is not able to connect to our TFS. With the same login/path I am able to check out projects from our TFS but then Rider treets the freshly checked out project as "not under version control" and does not recognize any changes.
I can add them all to version control and after that Rider recognizes changes in files. But it also still thinks that all other files are new, which is really not the case. In this picture, I added all files and changed one.
Am I doing something wrong here, as I am used to VS/TFS Version Control or might this be a bug? I asked the same thing in the community forum, but there is no real activity...
Have tested installing riderRS-171.4456.902.exe (Windows), the TFS Integration plugin has been bundled with Rider and enabled VCS-TFVC successfully. And it can detect the changes correctly. Please follow below requirements:
You must have the TF command line tool installed to be able to use
TFVC features. The minimum version supported by the plugin is 14.0.3.
To install the tool, download the latest "TEE-CLC-14...zip" file and
extract it to a known location. After extracting the files, you must
accept the license agreement. To do so, open a Command Prompt/Terminal
window, navigate to the extracted directory, and run tf eula. After
reading the EULA, enter y enter code hereto accept it. NOTE: If you
forget to do this, the plugin may fail to load with a
RuntimeException.
For the tool to be detected by the plugin, you must set the location of the executable in the Settings/Preferences menu by following these instructions:
Go to RD Settings Version Control -TFVC
In the Path to tf executable text field, navigate to the location of
the tf executable.
Click Test to test that the executable has been found and is working
as expected.
Click Apply then OK to save and exit.
Also check below things:
If TFVC does not come up as your version control system (VCS) then it
can be set manually. Go to the VCS dropdown menu in the toolbar and
select Enable Version Control Integration. Select TFVC from the
dropdown menu and click OK.
More details please refer this tutorial.
Please try to setup a new created project or select another project when you are using Rider with TFS. To narrow down if the issue is related to that special project.
Related
I'm having problems with merge tool in Visual Studio 2015. I didn't need the merge tool for the longest time, I haven't used it for couple of months. Now when I need it I can't find it. I was trying to google and find an answer, checking VS settings but with no success. I can only see buttons 'Overwrite Local File or Folder' and 'Keep Local File Contents'. When I press Compare button, I see diff tool but I'm not able to accept changes (check buttons are missing).
What am I doing wrong? How can I merge two files?
Please navigate to files in source control
Right click on file/folder you want to branch>>Merge
Full list of other solutions.
This is because these files in your local folder are not been tracked by TFS Version Control. For example, you added a file "readme.txt" in you local folder and hadn't check-in them into version control. Another people in your team also added this file in the same relative path and checked it into version control. Now, when you get the latest version or check in your changes, you will get the behavior as your screenshot. A similar question can be found here: TFS Conflict Type: Writable File - A writable file by same name exists locally
It's doing exactly the same things in Visual Studio 2017.
If you had a problem in workspace and you rollback it from a save, you can have the same issue.
You need to rebind some of the project by yourself first like the asked question here : Re etablish TFS source control bindings, then if all is going well you will see the button.
If it's not working, try to use external merge tool which will allow you to edit thoses files.
So far I was working my my project myself using Visual Studio Team Services using VS 2012, everything was good. Now I have added another user for my project and things are NOT working as I expected, below are my basic questions.
After my developer is done adding/editing files, does he needs to tell me the ChangeSet # to refer to? so I can get his Check-in's?
How Can I see What files he modified/Added? And is there a way I can get only the changes I want from the user instead of getting his/her entire changeset/files?
"Get Latest Version" does not really gets me the Latest Version of files which my developer modified.
See below answers:
After my developer is done adding/editing files, does he needs to tell me the ChangeSet # to refer to? so I can get his Check-in's?
--> He doesn't need to give you Changeset# to get latest(his check-ins). You can go to Team Explorer --> Source Control Explorer and then right click on your project and select "View History" to look at all the changes done to the project. Do you see his changes in the history? If yes then "Get Latest Version" should work. Sometimes what happens if you try to get latest version in Visual Studio Solution and if the files changed are not part of solution you won't get those files. In those cases you need to get latest from Source Control Explorer.
How Can I see What files he modified/Added? And is there a way I can get only the changes I want from the user instead of getting his/her entire changeset/files?
--> If you double click on the changeset after following the above steps to go to View History you will see all the files changed. If you want to get only few files from a check-in you will have to get the latest at file/folder level instead of getting it at project level. i.e. Find out all the files changed using above method and then go to individual files/folders in the Source Control Explorer to get latest.
We've finally managed to do the internal housework that should theoretically allow us to start using SVN as our Version Control system.
I've setup the latest version (3.3) of Collabnet Subversion Edge on a server and as far as I can tell it's happily pointed where we want it to be. Getting the Active Directory authentication is different issue)
I've created a new Repository (Timesheets) in the Admin Console with the default "Trunk" "Branch" and Tag" folder.
So I go into Delphi, connect to the repository and store my credentials. I can see the folders, which are empty. Exit the dialog and open the Project I want to add to the system.
I right click on the Timesheets.exe in the Project Manager screen, and choose Add to Version Control. It lists the files, and excludes a couple (fair enough). I browse to the VCS URL and select the "Trunk" folder. Add a comment, and click Import.
Boom
Server sent unexpected return value (405 Method Not Allowed) in response to MKCOL request...
followed by
'G:\Delphi\Timesheets' is not a working copy
Which it isn't - ti the first load into the VCS, which I'll then check out to create a Working Copy...
Any pointers?
Looks like the problem was an issue between Delphi XE2 and Subversion Edge 3.3.
Switching to Tortoise SVN allows us to add projects to the repository.
Somehow TFS Power Tools thinks my file is checked out, it won't let me check-out because that option is greyed out.
When I look in windows explorer I see my file with the little pen icon overlay. When I right-click and go to "Team Foundation Server", I choose undo but then get the message "There are no changes to undo in the selection or any children of the selection". If I right-click and go to Check-In then I get the message "no pending changes".
When I open source control explorer in Visual Studio it shows no pending changes for the file.
Can anyone please advise any steps I can take to resolve?
Can it be that the file is checked out by you on another workspace? Go to VStudio & check "Team Members" under Team Explorer. Right-click on yourself & select "Show pending changes". This should show all your checked out items, across all workspaces/worstations. You can also undo it there.Eventually, in order to find out what is happening with your file go in VS to"File">"Source Control">"Find in Source Control">"Status"Select the path to your module & hit 'find'. This should reveal if any other person has this file checked out
Seems strange, lets check common scenarios:
File is actually not checked-out but shown as checked-out in explorer
=> Please try to checkout file through VS, if you can, there is definitely some problem in Power Tools integration to Source COntrol. Restart machine. If problem is same then it might be case TFS credentials are different from Login windows credentials, status don't update sometimes.
File has set property of single check out by Admin & checked- out by anyone else thus preventing you from either check-out or check-in also undo checkout is not possible for same reason.
Create new workspace or try on other machine with different workspace.
=> Some times workspace conflicts, multiple mapping of same directory through multiple workspace creates problems.
Power Tools installation is corrupted or incompatible with some other extension.
=> Many a times, frequent abrupt power-off or etc corrupts software, reinstall latest Power tools. If problem persists, check if some other extension for VS or windows shell is not interrupting functioning.
Hope that helps, if not, let me know with more details like installed extensions, power tools version/ update installed.
I am new to TFS. I checked out a folder from TFS using Visual Studio and then deleted bunch of files/added couple of files within that folder using windows explorer (actually I didn't do it, but that folder has third party libraries and I used an installer which made all these changes).
Now if I go to Visual Studio and try to check in that folder, I am getting this error:
Check in: Operation not performed
Could not find file : /ThirdPartyFolder/aDeletedFile.aspx
I tried to follow the solution proposed in this post, but that didn't work out:
http://www.woodwardweb.com/tfs_top_tip/tfs_top_tip_11.html
When I do 'Get Specific Version' and specified 'change set 1', it doesn't show the deleted files in red as it does in the screenshot of that blog post. Also, when I click OK, it shows the Pending Changes-Conflicts window with all the files that got deleted. Even though I selected "Keep Local Version", when I try to check in, I am getting the same error again.
Is there a way in TFS to take what is in my local version and over write what is in the server with my local version files?
I have done similar operations using Subversion, and this has never been a problem. Hopefully someone will let me know how to achieve this in TFS.
Team Foundation Server requires that you explicitly pend changes for these files - if you delete a file locally, this does not explicitly pend a delete against Team Foundation Server. This is actually a useful feature - the server optimizes the data it sends you based on its knowledge of your local filesystem. That is to say, if you say "get latest", it knows your current versions and will only deliver the changes. If you're working with very large projects, this can be very efficient.
However, when other programs decide to make changes without pending the changes to the server, things can get a bit confused. Fortunately, TFS has the ability to detect changes that were made outside without explicitly pending those changes. You can use the "return online" capabilities of your TFS client.
You'll need the Team Foundation Server Power Tools installed, then you can simply run: tfpt online to detect those changes and select which ones to pend to the server.
(VS2012) Select the missing files from TFS "Check In" list and then right click on them and click on "Undo Changes" to exclude them from the list of "Check In"s forever.
This is one of the major differences between svn and tfs. Svn is somehow more integrated with windows shell and every change in your working folder will affect the server on commit. I propose you to perform any move, delete and rename actions within tfs UI, not from shell.