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 ...
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...
Is it possible in mercurial to ignore changes within an entire directory. For example I would like mercurial to not tell me that changes to the "class" directory have occurred since I don't want to version control the *.class files for my project. ...
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...
Our PowerBuilder application is fairly large and has many objects in several PBLs for organizing our code. We often have 10 or more datawindows on one window, and these datawindows may be spread across two or three PBLs. For version control, we use exclusive check-out to avoid merge conflicts. The situation is that when you right-click ...
So I've got a situation where we have a project with 10 developers. Each developer, when they come in for the day, is randomly issued a machine to use for development that day. The machine names are different, say DEV01 - DEV10. At the time that they are issued to the developers, the machines are identical, and no changes the develope...
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? ...
I'm involved in a project that, among other things, involves storing edits and changes to a large hierarchical document (HTML-formatted text). We want to include versioning of textual changes and of structural changes. Currently we're maintaining the tree of document sections in a relational database, but as we start working on how to ...
I, like many others, love Eclipse as my ide of choice, and because of the way I work (moving about, different places, different projects) want to use Git for CVS. There is a plugin for Git in Eclipse, Egit, which is now an official Eclipse project, and currently at version 0.7.1. As I've just started using it I'm interested in how othe...
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 I want to store different number of versions for each item in a single library depending upon the flag. I know out-of the box feature would apply at document library level, but I want to do it at item level with customization. Any idea , how can I do it? ...
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...
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 am working on a Drupal site with a few friends. Obviously we can Version control the code... but what do we do to keep each others databases in check? I have managed to get all the theming into files (contemplate etc), but ideally my views settings, menu settings would be in line also... (Not worried about Content either way as we're ...
I'm starting to do a small amount of development within my company. I'm intending to use Git for version control, and I'm interested to see what guidelines or standards people are using around version in their groups, similar to coding standards are often written within the group for the group. I'm assuming there will be things like; ...
What is the common way of dealing with the development.sqlite3 files with VCS (in particular, git)? If I commit this file to the VCS, will it be merged with another developer's copy? Or should each developer run the db:migrate task each time a new migration file is created? ...
I have some old code (an old but still maintained VB6 application) that from a source control point of view is the ultimate example of the plumber's plumbing (or cobbler's shoes). It's been version controlled by the approach of making a new directory for each version. Are there any major downsides to taking the following approach? Do...
I've used ( and still use ) mercurial and git. I have some repos hosted in a server with gitosis which is great and easy to setup. I am looking for a similar tool for hosting mercurial repos. It must provide minimal acl and ssh access and allow for remote config ( in the style of gitosis's "clone the admin repo and push changes" ). Ext...
My team uses SVN for source control. Recently, I've been working on a branch with occasional merges from the trunk and it's been a fairly annoying experience (cf. Joel Spolsky's "Subversion Story #1"), so I've been looking alternative ways to manage branches and merging. Given that a centralized SVN repository is non-negotiable, what I'd...
I'm looking for a very private source control/hosting solution. Short of hosting my own, and seeing as I'm the only collaborator, what is a good service for this? I'm using Git. The most important aspect is privacy. I don't want anyone to see my code, I'm simply using it for source control/backup. I will be the only developer. ...