I'm trying to implement a version control system, but as most of us know designers don't feel comfortable with version control systems. I'm looking for a solution mostly for our designers using Photoshop, Flash and other design tools. It's not a big deal to use a version control system, like VSS 2005, with our frontend and backend coder...
I work at a small LAMP Development Studio where the idea has been to just get the code done and go on to the next item on the list. The team works in Zend Studio 5.5 connected to the Live server via FTP or SFTP. What they love about this is the speed of their deployment of code (since its just modifying live code). But of course this i...
Everyone uses source-code control to manage versions (right?) and this provides some level of backup. There are times, however, when your local copy is out of sync with the repository. Moreover, some sandbox-type projects may not have yet ;-) made it into SCC. EDIT: I have multiple projects in my projects directories. Not all are in...
I have just built up my first SVN server, along with the mod_dav_svn module for Apache so that I have a rudimentary web view into the repository. There appear to be lots of alternate/additional packages to make the web view more full-featured, along the lines of what you would see at Launchpad or Sourceforge. What's your favorite web v...
Our small development shop is looking to migrate our projects from VSS to TFS, and we're evaluating TFS vs. others (haven't pulled the trigger quite yet). The nature of our software shop is such that we have 100+ projects in VSS ranging from small one-man-show projects to massive enterprise-wide applications. We are trying to determine...
If I delete a file in Subversion, how can I look at it's history and contents? If I try to do svn cat or svn log on a nonexistent file, it complains that the file doesn't exist. Also, if I wanted to resurrect the file, should I just svn add it back? (I asked specifically about Subversion, but I'd also like to hear about how Bazaar, Mer...
I use SVN as source control system and I wonder how to compare directories while ignoring any metadata differences. Is there a way to tell svn diff to compare only the actual content and ignore any metadata? I mean metadata like SVN properties, etc, that don't affect the file content. Assume file X has an additional property in branch ...
At my workplace we have one large Subversion repository which holds about 100 projects. Some projects use each other through svn:externals. Usually all people have read+write access to everything, but sometimes external people and interns have only restricted read/write access to some custom folders so they don't get our crown jewels. H...
I'm working in a project where we develop php on Zend using a mySQL database and the project is about to get to a point where it will be necessary to use version control not only for the actual code but also for the database. Also we are getting a good production server (and the actual production server will be a test server). So i w...
I'll try to make this as straight forward as possible. Currently our team has a VSS database where our projects are stored. Developers grab the code and place on their localhost machine and develop locally. Designated developer grabs latest version and pushes to development server. The problem is, when a file is removed from the proj...
After asking organising my Python project and then calling from a parent file in Python it's occurring to me that it'll be so much easier to put all my code in one file (data will be read in externally). I've always thought that this was bad project organisation but it seems to be the easiest way to deal with the problems I'm thinking I...
I want to build a revision control system for a wiki to learn Python. I would like to use a method that only stores latest versions and the delta but am open to other ideas. Do you know of any references/tutorials/books on how to build revision control? I only beginning to learn this area so any help is appreciated. I am open to exa...
A common scenario when using source control is to have a development branch along with versioned release branches. We use CVS, with HEAD as the development branch, and a branch named e.g. release-6-2 for the current release of a product. Development of new features go into the development branch only, but bug fixes sometimes have to be ...
I am using Team Foundation as source control for a solution with eight C# projects. In order to enforce decoupling and stability, I have only enabled dependencies between the project and their tests. What I would like to do is create a common folder where the compiled libraries and external tools can be placed and shared across the sol...
I am using SVN for development tasks, but still have many files managed with RCS, because it does not seem reasonable to edit them in my private SVN repository working copy (since they're often just configuration files that are also best tested in-place). It also doesn't seem reasonable to have a working copy of the repository wherever t...
I'm trying to integrate our Source Control(SourceAnywhere) with VS and are getting a lot of push back because of this one issue. Almost every time we open some of our Windows forms using 'View Designer' it edits the file (* appears beside file name). Nothing has yet been changed, I've tried comparing the before and after files and th...
I want to recomment Git to my boss as a new source control system, since we're stuck in the 90s with VSS (ouch), but are the tools and 3rd party support good enough yet? Specifically I'm talking about GUI front-ends similar to TortoiseSVN, decent visual diff/merge support, as well as stuff like email commit notifications and general sup...
I've created a SubVersion server on one of the machines in my workgroup. From my development box I'm able to access the repository and check in/out files without any problem. I've just installed TortoiseSVN and no matter what I do it won't connect to the repository on the server. I get the infamous error "No connection could be made bec...
Hi all For the last 6 months or so I've been using a 2-way Git mirror of our main Perforce repository at work to evaluate it for our workflow. I have to say I've fallen in love with using it but it has had one fatal flaw for me so far: it's Windows support is terrible. Generally this is not an issue for me but right now it is. I need...
I am currently using CVS (not my choice) and have several branches. I'm trying to merge two branches, but a deployment project file has conflicts that I can't resolve without spending a LOT of time. A trivial change to a project file results in drastic changes to that project file - thanks to GUID changes I guess (making a project file...