I am new to using VSS and it is the system used at work. Could anyone kindly give me some hints for the following:
Create/reviewing and applying changesets
Getting the latest version of the source but only the modified files (preferably using ss.exe)
Finding out the files which have been modified locally (again preferably using ss.exe or some other cli tool)
Receive emails when changesets are committed
Be notified (for merging) if I'm checkin in and the files the repo are newer
Thank you.
Related
Me - Front End web developer with an ok working knowledge of writing VB.NET code but I have never built a .NET project from scratch using Visual Studio.
External developer - Experienced VB.NET developer but completely new to version control and TFS. Also extremely cheap and prone to infuriatingly poor programming practices. He does things that make you bang your head on the table.
Background
Our external developer has coded our site but over the last few years I have been tweaking aspects of pages and have managed to learn quite a bit of VB.NET along the way. He has never used source control and I don't think he's ever had to work with another developer before.
Up until now he has maintained a local copy of the website. He makes changes to this local copy and when he wants us to test it he uploads the relevant files to our dev server. I have no experience of Visual Studio projects/solutions so if I have made tweaks to things I have edited the aspx/asxh/config files in my preferred editor and then uploaded them to the dev server. If everything works correctly I ask him to download them from the server so he can update his local copy.
I have been maintaining a local git repository of the website for the last 2 years. If he makes a change I check it in.
Obviously this is a nightmare to work with so we have now insisted that he starts using version control. I recommended GIT but he has decided to use TFS.
He has now put his solution and all the files into TFS. I have installed Visual Studio 2015 and successfully connected to TFS. I have mapped the files from source control to my own workspace but I am now at a loss as to what to do next.
Questions
As soon as I open the .sln file he has uploaded it says I have checked out the file and made changes. When I check the diff it seems to be because I am using a newer version of Visual Studio than he is. Does the .sln file need to be in version control? Or are we suppose to maintain our own versions of the .sln file and simply check in everything else?
If I try and build the project it fails because the web.config is set up for his machine and not mine. How can we maintain 3 versions of the web.config file? One for my local, one for his, and one for our dev/live environments?
I am not convinced he will have added the project to TFS correctly because he's never used it before. This is basically the blind leading the blind.
Question 1:
You need to put the .sln file in version control. Before check out the .sln file, please do a "get latest" step, which will make sure both of you are working on the latest version. When you try to check your local version in the server, and he had uploaded his local version in the server. You may have to solve conflicts before the check in.
Question 2:
You should build your project and published the website on the server. The build agent will only maintain one version of the web.config file. If he has built the project with his web.config. And you want to build the project again with your web.config, the build agent will delete the previous web.config and pull down your version. Then build the project with your's web.config.
Moreover, if both of you are not similar with TFS. Suggest you taking a look at below MSDN link which related to source control and build.
Use Team Foundation Version Control
TFS Vnext Build
Recently I have intalled VisualSVN and TortoiseSVN extensions in my Visual Studio 2015. I have successfully configured Repository and now it is working fine.
I have also configured svn:needs-lock property to my pages. Now, I need to know who is modifying or using the particular file and which is supposed to be committed.
The problem is that there may be multiple developers might be modifying multiple files and Now, I need a list of files which is exclusively checked out by developers. Just like a Pending Changes Explorer in Visual Studio for whole repository. So, where can I get a list of files which are being used same as Visual Source Safe Control?
If you need any information just ask me in comment I will add it.
Thanks!!
I'm trying to merge changes from a Trunk into a Branch. Previously when I've tried this everything has worked perfectly however in this instance the merge wizard has a cross next to "No uncommitted changes" and will not let me proceed. I've done everything I can think of to resolve this but as I have no entries in my "Pending changes" window I'm at a loss as to what could be the problem!
Any help or guidance on what to try next would be very much appreciated! I'm using Visual Studio 2012 with the latest stable 2.4 AnkhSVN release.
TL:DR - Downloaded TortoiseSVN and used it and VisualSVN server console to see exactly what was going on.
This was impossible to resolve with AnkhSVN alone. I downloaded TortoiseSVN and inspected the solution - turns out I had a tree conflict with one of my folders that had been renamed - logged into the VisualSVN Management server and deleted the "old" (original named) folder directly and pulled an update.
The next issue I discovered was the "obj" folder had somehow crept into the mix which was causing problems as visual studio loves updating files in here and so there were ALWAYS files to commit. Used TortoiseSVN to "Unversion and add to ignore list" on all the obj folders (Have about five projects in the solution that this had happened to!) and committed.
Once these steps had been taken I was able to update within Visual Studio using AnkhSVN and then use the AnkhSVN merge wizard to pull the changes from Trunk to Branch.
this file is not included in formmer questions such as
Files to ignore when using Visual Studio with Git
and
.gitignore for Visual Studio Projects and Solutions
but i dout whether these files should be ignored, anybody who is assured about this?
Source code is the only thing that should be committed. You don't want any artefacts committed to your repository. Ensure that your workflow does not carry any bad assumptions with it. Config files are another story. You want to track them, but you want them to be different (especially the connection strings) on different clones depending on their environment (eg. a CI server vs a developer's machine). Consider scripting or smudge/clean script (git attributes chapter in progit.org/book) for those cases.
For the most part, AnkhSVN is working well with VS2008. The only issue I'm seeing is when an image is added from one dev, it is not added to any other machines when the SubVersion Update to Latest Version is executed.
The log file shows that the image was in fact added and submitted to SVN, but no file is downloaded added locally.
So far I've only seen this with .gif files.
Any tips?
Thanks.
See here for why this is and how to resolve it:
SVN: Colleague checked in a folder into repository, but I can't Update my version to it
Subversion is not natively supported by Visual Studio 2008. Which add-on are you using to access Subversion?
I would use the SVN command line client or TortoiseSVN to do a checkout of the source code and see whether it is committed properly. Then take a look at whether the project files have a reference to the file at all.
I don't suppose you've added .gif files to your excluded list, right? It's tough to do that unintentionally. Worth at least looking at.
Did you also commit the project file. Most project files keep a list of items that should be included in the project. Adding a new file also adds it to that list.