We're using subversion, (the question could be applicable to many version control systems, but subversion is the one I really care about.) Our repository layout looks like so: (Layout A) Web branches tags trunk Libraries Foo branches tags trunk Bar branches tags trunk WindowsClient branches tags trunk DB branch...
I have created a bare git repo (lets call it repo #1) and cloned it. In the clone (repo #2) I have created several folders, one of which I have decided to make a git repo (repo #3). When I commit to repo #2, everything runs as expected exept that repo #3 is ignored (the .git folder, the files commit). How can I add repo #3 to repo #2 so ...
I have a couple of .refresh files that have somehow found their way into my perforce default pending changelist and from there somehow started showing as being in conflict with their depot counterparts. They are un diffable, unresolvable, I have excluded the files from being compared using the instructions on the perforce website and ye...
A colleague has installed VS2008 Team Explorer (as part of his role in Scrum) and can successfully use Work Items, Documents and Reports. I now want him to use the TFS Source Control for non-code files (documents etc). He can successfully open Source Control Explorer but everything is greyed out as nothing has been mapped locally. Unfort...
I'm looking for a good summary of best practices for working with TFS source control: Examples: Get latest before checking in Make sure everything builds after getting latest but before checking in etc. Thank you, Matt ...
We've been working with a Subversion repository for some time now for a research lab and have repeatedly been presented with a common issue: We want to version all of the code, and small bits of permanent data, but we also have large binary blobs that live within ignored directories in user checkouts and we'd like to make it easy for th...
I know this question has been beaten to death, resurrected, shot twice, resurrected again, and then buried, even at the risk of all the above, I'm still going to ask. What would be the best source control for someone who: is an older experienced programmer (not that willing to learn stuff he doesn't think he needs) never uses source...
I am the CTO and sole developer for my company. I'm getting ready to hire our first developer and possibly a second within the next 6-12 months. I'm embarrassed to say that I've never used source code control as part of my workflow. I guess being a 1-member development team has allowed me to be a bit lazy. It's not that I haven't wanted ...
I've been looking for a better way to deal with site-specific settings (in this case, the django settings.py file). The settings.py structure and fields are fairly consistent, but the values differ between the developer's boxes, the integration, QA, testing, and production environments. What's an elegant way to have the settings sourc...
I recently switched from a Java based project to a C#/.net project. I previously used IntelliJ which had the concept of change lists where you could group your pending changes together and check each group in individually. I have two problems with the pending changes window in visual studio. 1) Every time I check anything in, visual ...
I have two TFS branches that do not have a direct parent/child relationship in TFS. In a certain revision, 94 in my example, several items were deleted. I have been tasked with applying those deletes to the main branch. I'd like to do so through a baseless merge. I tried the following command to do so: tf merge /baseless /recursive /ver...
I'm currently reviewing repositoryhosting.com for possibly hosting our company code, however, I'm weary about pushing forward for a few reasons. First, if the company goes under, I have no assurance that I will have access to grab backups of the code prior. Secondly, their terms state this: "User agrees that Repository Hosting shall n...
Possible Duplicates: Do I really need version control? Using Version Control for Home Development I was reading a blog where the writer said this "Code doesn’t exist unless it’s checked into a version control system. Use version control for everything you do. Any version control, SVN, Git, even CVS, master it and use it...
This morning, I read two opinions on refactoring. Opinion 1 Opinion 2 They recommend branching (and subsequently merging) code to: Keep the trunk clean. Allow a developer to walk away from risky changes. In my experience (particularly with Borland's StarTeam), merging is a non-trival operation. And for that reason, I branch only ...
We're interested in moving from a source control system that supports the concept of shared or linked files. A shared file means: a file modified in one project, is automatically updated changed in every other project that uses that same file. It does this without a developer having to request it, reverse-integrate it, ask for it, or e...
I commonly work on multiple computers. I have various configuration files, eg, .bashrc, .gitconfig, .irbrc, .vimrc and configuration folders, eg, .vim/ that contain valuable customizations. Sometimes I want small variations in configuration between the different computers. I want to use version control to manage these different files. ...
I know that in Visual SourceSafe you can go in and drill down to the history of an individual file and then drill down to an individual check-in and apply a comment to the check-in that way but that's tedious and time consuming - if you have a lot of files that were checked in at the same time and you want the same comment to apply to al...
We have this huge application that has 18 projects in our source control (VSS). Whenever we are working on small changes everything is fine because each developer has a set of few files checkout to himself and hopefully no one is going to need them until they are checked in (in about 4 to 8 hours) But when we want to work on big change...
I'm not sure if this is possible but I'd like to be able to have a single file and use it in two projects saved in git repostories. Such that, if I make a change in one project the other one would pick up that change when the file was pulled. Ideally the history of that particular file would show all the changes from both projects. Ever...
git log lists all commits, from all branches that have been merged into HEAD. I want to get a list of merges, so I can see which branches have been merged into this one, and when. How can I get that information? I'm looking for something besides "launch gitk and look at the graph", since I know that one, but for very large histories wit...