Comments for Version Control Blog

Comment on Upgrading Drupal with Git by bhirsch

bhirsch — Thu, 29 Oct 2009 13:18:01 +0000

I just started using git for version control with Drupal. I love it, but there’s one thing that’s driving me crazy: For some reason git merges my changes to settings.php every time I checkout a branch.

I want settings.php in my master branch to connect to one mysql database, while settings.php in the second branch should connect to another. But every time I switch branches, I get this error:

bhirsch$ git checkout master
error: unable to unlink old ’sites/default/settings.php’ (Permission denied)
M sites/default/settings.php
Switched to branch ‘master’
bhirsch$

Here are suggestions I’ve picked up elsewhere that I’ve tried, but haven’t worked:
chmod og+w .git/object/16
and
chmod g+ws .git/

Any suggestions you can offer would be greatly appreciated.

Comment on Upgrading Drupal with Git by In the town called Workflow, lived three friends - Git, CVS and Drupal…. | ArvinderKang.com

Tue, 03 Mar 2009 02:42:56 +0000

[...] by Version Control Blog, ToolmanTim and [...]

Comment on Upgrading Drupal with Git by squadette

squadette — Tue, 09 Dec 2008 23:05:26 +0000

inc,

I do not :)

Comment on Upgrading Drupal with Git by inc

inc — Mon, 08 Dec 2008 07:13:40 +0000

Thank you for the excellent article, but one thing is undefined.
How do you include changes made in Drupal database in your repositaries?

Comment on Upgrading Drupal with Git by Drupal Development and Deployment using Git | ruzee.com - Steffen Rusitschka

Sat, 25 Oct 2008 15:45:16 +0000

[...] This part is similar to the method shown by the Version Control Blog, except I will not use cloning but branching instead. [...]

Comment on Dave Dribin: “Choosing a Distributed Version Control System” by dave.k.smith

dave.k.smith — Sat, 12 Jul 2008 00:15:28 +0000

Another comment related to the Version Control Blog itself: I am unable to modify my own profile on this site. When I click on my username above this comment box for example, I get the following:

Forbidden

You don’t have permission to access /wp-admin/profile.php on this server.
Apache/2.2.8 (Fedora) Server at versioncontrolblog.com Port 80

Comment on Dave Dribin: “Choosing a Distributed Version Control System” by dave.k.smith

dave.k.smith — Sat, 12 Jul 2008 00:13:13 +0000

The URLs on this page “Choosing a Distributed Version Control System” and “Why I Chose Mercurial” look right on initial load of the page (when I hover my mouse over these links), but when I click the links, the URL gets garbled (perhaps with a server-side rewrite or something) to the following (using the second link as an example):

http://versioncontrolblog.com/r/http://www.dribin.org/dave/blog/archives/2007/12/30/why_mercurial/

Comment on Upgrading Drupal with Git by drew

drew — Thu, 26 Jun 2008 00:12:10 +0000

This is very useful, thanks.
There is a mirror of the entire Drupal cvs tree here, http://mikkel.hoegh.org/blog/2008/a_git_mirror_for_drupal_cvs

This means you can use the Drupal Git repository (sounds like a fun place) as the pristine version and clone or branch it into other sites. I’m not to sure if having the entire Drupal tree is a good idea though, since Git will pass the whole history from clone to clone. It makes it ridiculously easy to switch drupal versions for testing.

The best thing about this method is that it doesn’t break the update status module like working with a cvs checkout does.

Comment on Microsoft Codeplex by John Collis

John Collis — Thu, 06 Mar 2008 12:53:52 +0000

Folks:

North America’s Premiere hosted VSTS/TFS service is now live!

Check us out at:
http://www.teamdevcentral.com

Cheers,

John Collis

Comment on Upgrading Drupal with Git by squadette

squadette — Fri, 22 Feb 2008 20:46:12 +0000

benjamin,

fixed! stupid wordpress.