version-control

Commercial version control

My boss wants me to think about what to use for version control. I am a big fan of subversion, bazaar, mercurial, etc. However, we have a policy at our shop to not use open source tools! Does anyone know of any good commercia/proprietary version control tools? We are a .NET shop and I know about Visual SourceSafe. However, I have heard ...

Does it make sense to permanently delete versions from a VCS as part of a normal development process?

We use ClearCase at my workplace. Part of our standard process when code is merged to the main (trunk) branch is to completely eradicate all of the versions on development and integration branches. Because this wipes out all of the check-in comments that went along with these versions, our source files have to have a lengthy prologue com...

Multiple Programmers in Software Development. How do we work on the same code and it always be updated??

This seems like something I should know by now, but for whatever reason I do not. I also am not having much luck searching on the topic. A friend and I are starting a simple project together away from work, both of us are very young in the programming world and want to take on a simple educational project for our free time... My questio...

Using Mercurial hooks to create/load database dumps for versioning

I've started using Mercurial for version-controlling my Drupal project source files (I'm both a VCS and Mercurial newbie). However, the database is still "version-controlled" using a directory of dated .sql.gz files. What I want is to have a single database dump file somewhere within my repository, that would be overwritten with a curre...

SCM with locks vs. concurrent merges and team size

What is the ideal number of programmers for lock based SCM not to become a severe issue in development? Edit: Fundamentally, I am not asking if there are merits to locking or merging (that is an unresolvable flame war). I am asking for the number of programmers where locking becomes a serious problem. I myself have found 4 to a good nu...

Good version control system for eveyday files

I want to start putting all of my non-code personal files (i.e., word docs, excel spreadsheets, everything but media, etc.) under version control. The main reasons I want to do this is so that I can scan for changes and have some some control before I check in the files to the repository. TortoiseSVN is perfect for this, however I'm lo...

Version control for Adobe Flash projects

I'm working with a very complex Flash project which is part of a full range of services that we deploy for the use of our clients. For most of our software sources (Java, PHP, Javascript, HTML and a some supporting scripts in other languages) we use subversion for version control and management, so we do the same for our Flash projects, ...

Last existing revision of deleted file in SVN

So I removed file X from SVN many moons ago, and I have the revision number of that delete. I would like to know the revision number of the previous commit (i.e. the last existing version of file X). CVS was sequential, so I could just -1, but this does not appear to be the case with SVN. ...

Using MS Team System 2008 Database Edition

Hi, guys! I'm wanting to start source controlling our DBs. I've read a lot of questions here and have found that MS Team System 2008 with Database Edition is what I need. So we get it and we are kind of lost really. We would like in first place, compare the different DBs we have (DEV, STA and PROD) because we had never done any source ...

Convert SCCS repository to SVN

I'm investigating migrating a source code repository currently kept under SCCS on an aging Digital UNIX box to Subversion on a Windows box. My initial searching has led me to a python script, sccs2svn, which looks like it would do the job - with some restrictions. A du -sk on the SCCS directory shows it to be about 550MB in size. From w...

How can I get a complete version from TortoiseHg

Hi! I am using TortoiseHg as my source control for developing a CMS project written in .NET/C#. I don't know how can I get a whole complete version from my source repository. Is it possible? a version for a specified date. Thank you. ...

Which SCM/VCS cope well with moving text between files?

We are having havoc with our project at work, because our VCS is doing some awful merging when we move information across files. The scenario is thus: You have lots of files that, say, contain information about terms from a dictionary, so you have a file for each letter of the alphabet. Users entering terms blindly follow the diction...

git push failing

I created centralized git repositories on my department's sun solaris server using mkdir /var/git/myapp.git cd /var/git/myapp.git git --bare init last week i did this for 3 of our currently under development applications and pushed the master of these applications to the server git remote add origin ssh://myserver.com/var/git/myapp....

What is the simplest way to do branching and merging using Tortoise SVN?

I have not found a really simple "how to" any where so I came up with my own through trial and error and wanted to share it, i.e. I will answer this question myself. ...

Recursively CVS add files/directories and ignore existing CVS files.

There's a similar post @ http://stackoverflow.com/questions/5071/how-to-add-cvs-directories-recursively However, trying out some of the answers such as: find . -type f -print0| xargs -0 cvs add Gave: cvs add: cannot open CVS/Entries for reading: No such file or directory cvs [add aborted]: no repository And find . \! -name...

NetBeans version control for newb?

I'm a relatively new programmer and I've never used version control before. I'm working on a Java project in NetBeans and was wondering about some good version control options that are relatively easy to install and use. Not sure if it matters, but I run OSX. ...

Git merge squash repeatedly

I'm trying to have two branches with binary files in git - one "development" and one "stable". The development branch can have several changes of these files before I want to "release" them to the stable branch (and the stable branch has those files renamed, in case that's relevant). I could do a normal merge, this works fine, but prese...

Convert existing database to Database project

I have a MS-SQL database on a server and have decided to play around with source control for the database. I want to create a database project and include that project within my solution. Is there any way to "import" an existing database into a database project in Visual Studio 2008? I have run a few searches but I haven't really found ...

Xcode and SCM conflict error.

I am getting this following error even though i am the only person working on this project. > Error: 155015 (A conflict in the working copy obstructs the current operation) Description: Commit failed why would this occur as all i keep doing is committing the project every time before do some serious coding. I have committed three time...

Source control: bound to the IDE or not?

My solutions are fairly large, are in SourceGear Vault and are bound to VS2008 IDE. I find that it takes a while to simply open them. In the long run, is it better to have the solutions bound to VS2008, just simply resolve the renegades later manually or use the Source Control IDE to check files out one at a time when the need arises. ...