TFVC to GIT to TFVC – is it possible?

YES! It is possible.

Well, there it is not very straight forward but after you get the correct tools, then it becomes very easy.

TFVC to GIT

In my tests I first converted a project from TFVC to GIT, it was done using the tool git-tfs. The easiest way to install it, it is using Chocolatey, with the command: choco install gittfs

After done the installation you can simply convert any TFVC in GIT, you can read more details in the previous link or simply run the command to fetch all the history for all branches:

git tfs clone https://tfs.codeplex.com:443/tfs/Collection $/project/trunk . --branches=all

commandtfvctogit

After that you must push the changes to a GIT repository:

git remote add origin https://github.com/user/project.git

For TFS your repository is found with this URL standard: http://yourserver:8080/tfs/Collection/ProjectName/_git/GitRepository (or https, changing the port to 443)

Now you can push the content:

git push --all origin

 

Then in the history, you can see this result comparing TFVC and GIT repositories:
comparetfvcgit

As you can see above all history was kept, even the dates and who did the change. Until here we have a great tool to move our TFVC project to GIT without losing any history.

GIT to TFVC

For this move I am using another tool, git-tf,  also it is very simple. Simple execute the code below to configure the git-tf tool:

git tf configure http://yourserver:8080/tfs/Collection “$\TeamProjectName” –force

I’m using the flag “force” to ensure that the configuration is being applied. Then you must check-in your project to the new team project:

git tf checkin –deep –autosquash –keep-author

Look how the history looks for GIT and TFVC now:

comparegittfvc

The new TFVC is created with the history, but the dates are not kept unfortunately the tool has such limitation.

 

Anyway, this approach can help some people to simply move from one to another.

Anúncios

VSCode + Git – Step-by-Step

Hey guys, I’m amazed with VSCode, it’s simple and powerful!

My idea with this post is to make it more simplified, and clear for the ones that are just starting with code.

You must have in your machine VSCode and Git installed!

Also you must have a repository ready to be used, in my case I’m using VSTS:
Git

Now to setup your environment:

  1. Open the command prompt in the folder you want to add your project files
    GitClone
  2. Press enter and then your code will be cloned locally
    GitCloning
  3. Now to open in your VSCode just typing “code .” in the project’s folder
    (This is the folder where are your project files)
    Then you will be able to see the project:
    CodeProject
  4. Now go to Git tab
    GitTab
    Now change some file and save, and then it will appear in the Git tab as a change
    GitChange.png
  5. Now you can add a message and Commit All
    GitCommitAll
    At this point you committed your code to your local repository, then if you and to send it to the remote Git, you must sync your code.
  6. Sync to the origin
    GitSync
    Once you press sync, it will execute a git pull and then a git push, that way it can ensure that you are integrating all changes locally and then sending all integrated code back to the server. Conflicts may appear, depending on the changes done pushed to the server previously, in that case VSCode will show for you the conflict and you may use its tool to fix the conflict.