NOTE: This repository is deprecated, as its entire raison d'etre is now provided by DKAN Starter. See the DKAN Starter repository and documentation for more information.

DKAN on Acquia

7.x-1.7

Prepare your repo

Save your settings file

$ mkdir assets
$ mv docroot/sites/default/settings.php assets/
$ ln -s ../../../assets/settings.php docroot/sites/default/settings.php

Save your custom modules

$ mkdir projects
$ mv docroot/sites/all/* projects/
$ rm -rf docroot/sites/all
$ ln -s ../../projects docroot/sites/all

Add this repo as a remote to merge changes

$ git remote add dkan-updates https://github.com/NuCivic/acquia-dkan.git

After that your .git/config file should look like this:

[core]
	repositoryformatversion = 0
	filemode = true
	bare = false
	logallrefupdates = true
	ignorecase = true
	precomposeunicode = true
[remote "origin"]
	url = git@github.com:NuCivic/acquia-dkan-test.git
	fetch = +refs/heads/*:refs/remotes/origin/*
[branch "master"]
	remote = origin
	merge = refs/heads/master

$ git fetch dkan-updates

Update dkan

# create a branch so you can try this safely
$ git checkout -b updating_dkan
# fetch update from dkan-updates remote
$ git fetch dkan-updates
$ git merge dkan-updates/master -X theirs

After the merge check if the diff looks reasonable

$ git diff master

If it does, update your master branch

$ git checkout master
$ git rebase updating_dkan
$ git branch -D updating_dkan
$ git push origin master