Comments 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.

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 [...]

By: squadette

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

inc,

I do not :)

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?

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. [...]

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.

By: squadette

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

benjamin,

fixed! stupid wordpress.

By: benjamin

benjamin — Mon, 18 Feb 2008 13:18:07 +0000

this line:
$ tar –strip-components=1 -C drupal -zxv -f drupal-5.2.tar.gz

results in this error:
tar: You may not specify more than one `-Acdtrux’ option

Urgh. That’s the line that’s supposed to make all of this worthwhile :-P

(I have read the tar man page more times than — ah, I got it. It needs to be doule-dash for a long-form command!)

Needs to be:

$ tar --strip-components=1 -C drupal -zxv -f drupal-5.2.tar.gz

By: squadette

squadette — Sun, 10 Feb 2008 17:35:54 +0000

hofo,

in short: merging will be much more tedious and error-prone.

In Git, merging really works like a charm.

In Subversion — wait for 1.5 where repeated merging will be much more integrated.

By: squadette

squadette — Sun, 10 Feb 2008 17:34:11 +0000

santry,

I believe that for tutorial my approach of multiple clones is much more accessible.

First, it’s easy to “screw up” the repository if you’re doing heavy branches here. My target audience is not Git experts, so they will have trouble if mental model is out of sync with the repository state.

Second, you will usually have several sites under this scheme, and it’s easier to just rsync the directory without worrying which branch is currently checked out there.

Third, I have to admit with a shame that I do not completely understand how branches work in Git — I just didn’t have the chance to use it in production.