Overview I'm building a website in django. I need to allow people to begin to add flatpages, and set some settings in the admin. These changes should be definitive, since that information comes from the client. However, I'm also developing the backend, and as such will am creating and migrating tables. I push these changes to the hu...
I'm looking at the mercurial handbook, chapter 6 "Working with multiple branches". In there the author states that if you have separate versions/branches of the same software that it makes sense in an implied obvious way to host each branch of the software in a separate repository. I know that Mercurial supports tags (which is the way t...
A while back I was looking for an embeddable distributed version control system in Java, and I think I have found it in JGit, which is a pure Java implementation of git. However, there is not much in the way of sample code or tutorials. How can I use JGit to retrieve the HEAD version of a certain file (just like "svn cat" or "hg cat" wh...
I was wondering which DVCS is most conducive to experimentation i.e. branching, etc. I want something where anyone can quickly launch smaller projects and refactor code quickly. I want to create an environment where experimenting is cheap and can be discarded/merged easily. ...
What were the reason for chosing Mercurial as a basis of FogCreek Kiln, a source control management system with tightly integrated code review, and FogBugz integration? Why Mercurial, and not other (distributed) version control system, like Bazaar, Git or Monotone, or creating own version control system like Fossil (distributed software...
I have started a Mercurial based project on google code. I have worked in subversion for sometime, but I am confused with what to do what in Hg. I would like help on the following: How do I initialize project (first on my local machine) (then from my local copy to google's server) How do I get my copy of a build from the server How do...
Apparently, when you move a function from one source code file to another, the git revision log (for the new file) can show you where that code fragment was originally coming from (see for example the Viewing History section in this tutorial). How does this work? ...
I'm currently trying to evaluate Mercurial, to get a feel for the philosophy the system tries to promote - but one thing that's got me confused is the presence of the bundled 'extensions' and how they fit into the mix. In the core package, Mercurial ships with a bunch of functionality that is implemented as extensions but is disabled b...
The point in removing trailing whitespace is that if everyone does it always then you end up with a diff that is minimal, ie. it consists only of code changes and not whitespace changes. However when working with other people who do not practice this, removing all trailing whitespace with your editor or a pre-commit hook results in an e...
One of the annoying things about Smalltalk is that it (usually) requires its own VCS, due to the way that it manages its source code. Squeak and Gemstone (at least in its GLASS version) have a DVCS called Monticello that works passably well. As near as I can tell, VisualWorks' main VCS, StORE, only works in old-fashioned centralized mo...
I removed a class a feature from my code a while back and committed the removal. The feature was implemented as a single class with a BDD-style spec and a few other classes were altered in the removal commit as they made use of the feature. The commit is clean, in that the only change in the commit is the removal of this one feature. N...
Hello Everyone, I have projects that multiple developers are working on. We all work off the same git repository. Currently, I do not store production server configuration in the repository, because the configuration files contain database credentials. I would like to start storing these configurations in the repository, so I'm thinki...
Hi, I've read a few git questions here, but could not find an answer to this one: I have a public and a private branches where I want to allow certain files to diverge. Those are configuration files with passwords and my local customizations. I do want to be able to merge the branches both ways: from private to public and back, but...
I'm using Mercurial in a recent project. On the web server where I'm deploying the project I have a slightly different config file with production settings. The problem is when I pull and update, I often have to merge and commit as well. Is this the correct workflow? It seems strange that in order to be able to continue to update I h...
I deleted a bunch of files / directories from a git repository using rm, the Finder, etc. I'm looking for a git command that'll record these to the index as marked for removal. (As if I had called git rm on them.) I understand git add -u will do this, along with a bunch of other things. I'd like my command to exclusively handle removal...
Hi, TortoiseHg web server configuration has an "Allow Push" parameter where I put the users allowed to push changes. But when I try to push I get an "authorization failed" error. How are the users authenticated? Where do the passwords come from? ...
There are similar questions on SO but I'd like some clearer answers here. How important is DVCS not littering your working folder with files? (Alternately is single file repository a big plus to you?) How important is cherry-picking functionality (choosing arbitrary changes instead of lineage of changes)? How important is the speed of ...
Is it possible to rename directories with Fossil? I've tried the obvious command: fossil mv oldname newname Fossil then informs me that it has done something: RENAME oldname newname However, calling "fossil changes" results in an empty list. As far as I can tell, renaming directories is either not supported, not yet implemented o...
Bazaar has a Launchpad pseudo-protocol (lp:) that able the user to operate in remote branchs without write full Launchpad location, I'm searching a way to create my own pseudo-protocols in a way like this (similar to GIT): bzr remote my sftp://[email protected]/home/myuser/myrepo/ bzr push my:mybranch bzr push my:otherbranch bzr push ...
I've been using SVN for some time now, and am pretty happy with how it works (but I can't say I'm an expert, and I haven't really done much with branches and merging). However an opportunity has arisen to put in some new practises on a new team and so I thought I'd take a look at DVCSs to see if it's worth making the jump. The company I...