So I created a new branch from master and eventually merge the changes back, only some changes seemed to merge and it would seem I merged in one direction. Eventually I just decided to be sure master received all the 'experimental' changes then I deleted the experimental branch and made a new one. So this question is turning into a few q...
Hi, We own a small company and develop asp.net websites. Here is our work procedure: We have a server at the company with Sql Server 2008 and IIS 7.5 installed on it. All our projects including the database and website pages are on the server. We connect to the server and edit the files using FTP, so any change to a web page can be seen ...
I am in this situation: I have to split a JEDI VCS server. I have 4 Delphi projects on it, and I have to give 2 projects to a company and 2 to the other company. The idea is: I restore 2 JEDI VCS backups (2 database backups) and I remove the projects of the other customer. Now it is not possible to really remove a project from JEDI beca...
Hi, Can a Version control System(like Subversion) help me protecting my code? I'd like to hire outside freelance coders(or an outsourced team) to work on a web application project. I'd like that outside coders working on the project should have access to only that part of the code on which they are working and not to the complete ...
Is there a way to configure Mercurial to allow for empty commit messages? If you try hg commit through the CLI without entering a commit message, the commit is canceled with: abort: empty commit message. Now, I know that committing without a message is usually considered bad form, but does Mercurial allow it at all? ...
I joined a team with greenfield code. When I joined, they did not have a common repository, and they emailed me a tarball of his latest. (yeah, I know...) I've been working off that tarball, making changes and adding files. Now the team has a Mercurial repository (hooray!), and it's been populated with the same code containing more recen...
Hi all, I come from an environment using subversion with TortoiseSVN for source control. Now in a new area, I will be using TFS. I have a couple of questions, i'm sure more will follow ;-) : What things should I keep in mind when moving across It obviously (I hope!) has all the same features, where I can commit changes with comment, ...
I made a website almost 2 years ago that needs some serious T.L.C. I've been maintaining the site, doing bug fixes and the like but I only ever wrote 'ideas' and features for the site on scrap paper or in a text file somewhere on my computer. The site never had a 'structured' development plan as it was just something fun to do at the tim...
With their August 2010 release (they have a very clean road-map on their site), what are the advantages Git# (or GitSharp) and applications based on it have over current alternatives on Windows? I mean advantages that could not have been possible without Git#. Edit: Question wasn't framed properly. ...
Is there an efficient way that doesn't require too much fiddling (I can cope with a bit) to get version control working across > 1 environments? By that, I mean multiple IDEs; I am developing on VS2010 at home, but I'd like to work on the project at university with my laptop. My laptop is running Debian and I'm open to suggestion for wha...
Possible Duplicate: How and/or why is merging in Git better than in SVN? I often hear that branching/merging in SVN is more painful than with Git, can anyone give a concrete but simple example? ...
Hi Everyone, I've been given the task of restructuring our Repositories upon moving to SourceGear Fortress (for those that don't know this product, think Stable, Reliable SourceSafe on Steroids :P) I know how I'm going to organise all of my projects and solutions, the problem that I'm having is how to organise these into repositories. ...
We have a table in our our database that stores XSL's and XSD's that are applied to XML documents created in our application. This table is versioned in the sense that each time a change is made, a new row is created. I'm trying to propose that we store the XSL's and XSD's as files in our Source control system instead of relying on the...
Hello, here where we work, we have a bunch of merging problems. We use SVN and I know that is not a problem with the tool, but with the policy. But, what are the best merging pratices/policies to minimize this. Or is there a VCS that makes merging more easier than SVN? ...
I'm working on a project that is being versioned with svn. Normally with git, I would pick which files I'd like to make as part of a commit with git add, and then make a commit. The problem is, I don't know if there is a similar way to do something like that in subversion. I end up working on a feature, then get interrupted to fix a bug...
I have a mecurial server setup and would like to use it for source control over apache. The setup i followed, however, requires that I have a .htpasswd which it uses to authenticate mecurial users. Is it possible to have this authenticated list be the people who are already users on the server so they don't have to create new id's and p...
I'd like to be able to edit the CSS/HTML of my website on my iMac and Macbook (may sometimes be offline). Hosting is shared I'd like to be able to easily synchronise local and online versions, with revision history. In the past I've used MAMP with TextMate, but I've been looking at VirtualHostX, Versions and Espresso. I'm not tech savv...
I would make crazy use of such a revision control. If it doesn't exist - where would to a good starting point for building one? I can probably make a lot of designs and interaction flows, but to implement it is another thing. Would it be a good idea start by creating a macro to work with Adobe Photoshop / Illustrator? Or one of the onl...
I am using Ankhsvn for a solo project. I would like to version this project and add a little log tag to specify release notes. Is this possible? I believe this is the tag feature, but it requests a folder to use which doesn't exist on my system (ie not the repository folder). ...
For a team of 4-5 developers using Visual Source Safe(VSS) 2005 what is best practice to maintain source versions? Our requirement is to maintain and identify a version that is currently in production. This way at all times we will know what piece of code was pushed during deployment. So far this is what I had in mind. -trunk - Main...