Why isn't there a Team Foundation Server Express Edition?
Why isn't there a Team Foundation Server Express Edition? ...
version-control
How to merge from branch to branch and back again (bidirectional merging) in SVN?
Using the svnmerge.py tool it is possible to merge between branches, up and down. It is hard to find the details for doing this. Hopefully, v1.5 will have a neat method for doing this without using svnmerge.py - details requested! ...
Refactoring and Source Control: How To?
I am completely on board with the ideas behind TDD, Refactoring and Patterns however it does seem like there is a huge gaping whole in these ideas, mainly that they are great for dev teams of 1, but when you start refactoring code that 10 people are working on you start getting merge conflicts all over the place and most diff/merge softw...
What is a good, non-distributed, alternative to subversion that has excellent branching and merging support?
I'm sick and tired of manually tracking my branches and merges across my repository! It's too error prone. In a world where everyone seems to get the idea of reducing duplication and automating everything, subversion branching/merging feels like it's left over from the 80's. What is a good alternative to subversion that has excellent bra...
What is the best way to integrate TFS version control with XCode?
Working on implementing TFS throughout our organization. It is easy to integrate with .NET projects and any platform that uses Eclipse or a derivative of Eclipse for editing. What's the best way to use TFS version control with XCode (now that I find out we need to write some iPhone applications)? ...
cvs error on checkin
When trying to commit to a cvs branch after adding a new file I get this error Assertion failed: key != NULL, file hash.c, line 317 Any idea how to fix it so I can check my code in? both server and client are Linux there are pre-commits involved ...
Is there a distributed VCS that can manage large files?
Is there a distributed version control system (git, bazaar, mercurial, darcs etc.) that can handle files larger than available RAM? I need to be able to commit large binary files (i.e. datasets, source video/images, archives), but I don't need to be able to diff them, just be able to commit and then update when the file changes. I last...
How to create project specific respository post-commit actions
Presently, we've got several main projects each in their own repository. We will have to version-control up to a dozen additional projects. VisualSVN recommends to create 1 respository for our company and then vc all projects inside that. It's a good practice to create one repository for the entire company or department and store al...
Long term source code archiving: Is it possible?
I'm curious about keeping source code around reliably and securely for several years. From my research/experience: Optical media, such as burned DVD-R's lose bits of data over time. After a couple years, I don't get all the files off that I put on them. Read errors, etc. Hard drives are mechanical and subject to failure/obsolescence wi...
Is there a code review tool with Word like annotation functionality and TFS integration?
I'm looking for a code review tool that has something like Word's review tools. I would like the ability to add a note in the side bar that references a specific block of code as well as to have portions of the code that are changed tracked so that someone else can open the file later and accept/reject the changes. If it were integrate...
Stored procedures/DB schema in source control
Do you guys keep track of stored procedures and database schema in your source control system of choice? When you make a chance (add a table, update an stored proc, how do you get the changes into source control? We use SQL Server at work, and I've begun using darcs for versioning, but I'd be curious about general strategies as well ...
What are the relative strengths and weaknesses of Git, Mercurial, and Bazaar?
What do folks here see as the relative strengths and weaknesses of Git, Mercurial, and Bazaar? In considering each of them with one another and against version control systems like SVN and Perforce, what issues should be considered? In planning a migration from SVN to one of these distributed version control systems, what factors would...
Extract relevant changes for code review
I'm working on a project with a team where we check in early and often. Individual checkins are completed to the satisfaction of the developer doing the change (including tests where possible) but sometimes the direction of work changes slightly and previous commits need to be reverted and done another way. Or, stub code is filled out in...
What are the best practices for moving between version control systems?
There are about 200 projects in cvs and at least 100 projects in vss. Some are inactive code in maintenance mode. Some are legacy apps. Some are old apps no longer in use. About 10% are in active development. The plan is to move everything to perforce my end of year 2009. Has anyone done a large migration like this? Has anyone come ac...
How to migrate SVN with history to a new Git repository?
I read git manual, FAQ, Git - SVN crash course, etc. and they all explain this and that, but nowhere can you find a simple instruction like: SVN repository in: svn://myserver/path/to/svn/repos Git repository in: git://myserver/path/to/git/repos git-do-the-magic-svn-import-with-history svn://myserver/path/to/svn/repos git://myserver/pat...
Why don't they teach these things in school?
Over the summer, I was fortunate enough to get into Google Summer of Code. I learned a lot (probably more than I've learned in the sum of all my university coursework). I'm really wondering why they don't teach a few of the things I learned sooner in school though. To name a few: unit testing version control agile development It s...
storing revision changes of a message
What algorithms and processes are involved in storing revision changes like stackoverflow and wikipedia do? Is only one copy of the message kept? And if so is it only the latest copy? Then only changes to go back to the previous version(s) are stored from there? (This would make for a faster display of the main message). Or are compl...
Codeplex/Sourceforge for internal use
I'm looking for a free/open source collaborative project manager that can be deployed internally in my workplace that would act similar to Codeplex or Sourceforge. Does anyone know of something like this, and if so do you have experience with it. Requirements: Open Source or Free Locally Deployable Has the same types of features found...
What is the best Git GUI on OSX?
What is the best GUI on OSX for viewing a repository, and (optionally) manipulating it? ...
Code/Document Management for a very small company
I work for a very small company (~5 employees, 2.5 coders). We have gotten away with no code or document management for several years, but it's starting to catch up with us as we grow a bit. Any suggestions for a management system. Free is better, but cheap is acceptable. We just don't want to spend more time on installation/configur...