I'm curious what kind of content should be in a versioned file commit comment. Should it describe generally what changed (e.g. "The widget screen was changed to display only active widgets") or should it be more specific (e.g. "A new condition was added to the where clause of the fetchWidget query to retrieve only active widgets by defa...
When we finally started using source control, old versions of code were added into the SVN in their own discrete folders, so I ended up with root \libv4 \libv4.2 \lib4.3 \lib5 What I would like to get to is having these older versions of the code as tagged versions inside the repository, like this: root \lib \tags \v4 ...
First off the technical stuff: We're using VS 2008 pro and running a MS SQL 2008 server. For sourcecontrol we use Subversion. We'd really like to keep our stored procedures in subversion, so we can tell what was changed, when and so forth. However in order for this to work, it has to be seamless, otherwise the developers are just goin...
Hi all! I am probably asking for too much: does anyone know a way to get XCode color the lines of code according to their subversion status (modified, added, etc.)? It would be nice to have it integrated in XCode. ...
I like to distinguish three different types of conflict from a version control system (VCS): textual syntactic semantic A textual conflict is one that is detected by the merge or update process. This is flagged by the system. A commit of the result is not permitted by the VCS until the conflict is resolved. A syntactic conflict is n...
We're looking to move off of sourcesafe and on to a more robust source control system for our .Net apps. We're also looking for scripted/automated deployments. I'm a .Net developer (web and winforms). However, most of our development staff is RPG for the IBM iSeries and the devs use Aldon's LMI for source control and deployment. Our man...
I've heard for instance that merging branches with git or mercurial is easier than with svn. Reading last Joel on software blog entry, I didn't get it exactly why. Could you provide a concrete example where merging with git/mercurial lead to less merge conflicts compared to svn please? ...
I'm and open source and SVN lover. We at the company are at a situation that must decide between SVN or Team Foundation Server. I'm trying to convince others to use SVN because I think TFS is enhanced in large teams. We are just 7 developers and 3 testers. Am I right about this? ...
For some reason, we can't update the SVN in some build machines. Installed svn version is 1.3.x. But Hudson slave used 1.6 to create a checkout. This means we can't run "svn info" on those checkouts: $ svnversion subversion/libsvn_wc/questions.c:110: (apr_err=155021) svn: This client is too old to work with working copy '.'; please get...
I've been playing around with different versioning systems to find one I'm comfortable with. I started with SVN (lets call this version of the project "f1"), then changed over to GIT. But I didn't know how to convert the old SVN repo to GIT, so I just copied the folder, deleted the .svn stuff, and turned it into a GIT repo (lets call thi...
Scenario: Programmer creates a branch for project 'foo' called 'my_foo' at revision 5 Programmer makes multiple changes to multiple files as he works on the 'my_foo' feature. At the end of each major step, say adding several new functions to a class, the programmer does an svn commit on the appropriate files therefore committing them...
I Just think that I could actually contribute code much faster if I didn't have to learn what is an almost entirely other subject. ...
Hi all, quick question about svn checkout best practice. Once the structure of a repository is set up, ie trunk, branches, tags, is it normal to have the root checked out to our local machines. Or should you only check out the trunk if that's what you are working on or a branch if we so choose to create one. The reason i ask is that ev...
hi all, i am using cruise control to automate the svn commit process. but the execution of svn commit command restores the files which i deleted from my working copy. the way i am doing is. 1. delete some files in my working copy.( no. of files in my WC is less than no. of files in repository) 2. execute svn command using cruise contr...
Me and two other guys recently started our own web development company. We each work from our homes and have decided we want to keep one central location for all of our files. These files include word documents, spreadsheets, client files, designs.. etc. Anything pertaining to our company. I have a pretty solid internet connection an...
Hi! Imagine there's a project in Bamboo with two build plans: Staging Deployment (SD) and Production Deployment (PD). Building SD checks out latest sources, builds them and deploys a web site to a staging server. Currently, PD does all the same, namely deploys the latest version of a web site to a production server. Clearly, this is not...
Hello all, Is anyone aware of an OS X tool to monitor SVN repositories for new commits? I am looking for an OS X equivalent to CommitMonitor of the Windows world. Thanks in advance. ...
I can't figure this out. I try to import a new project into a svn repository from Netbeans and get 403 Forbidden. I just setup svn on my serverbox today. I can get to it through a browser just fine, though its empty as I haven't imported my project yet. Apache's path for html files is /var/www I setup the svn repo in /var/svn This is t...
I am fairly new to Subversion and was wondering how exactly to ignore all folders by a specific name. From what I have read, I think I need to use the svn:ignore function, but I have no clue on how to actually do this. Some places mention a config file.. some say command prompt. I have my subversion repo set up on a windows 2008 ser...
I would like to customize an off-the-shelf software that has a Lite Edition and an Enterprise Edition. The features are almost the same so that my extended customizations can work for both, but I have to recompile for each version because they have different version assemblies. Can someone help advise me on how maintain this? I am usin...