RedmineVersion » History » Version 5
Version 4 (Chris Cannam, 2010-11-19 01:23 PM) → Version 5/9 (Chris Cannam, 2010-11-19 01:29 PM)
h1. Which version of Redmine?
Our Redmine installation is made from a version maintained in an Hg repository (see "the Repository tab for this project":https://code.soundsoftware.ac.uk/projects/soundsoftware-site/repository).
This currently has two branches: @default@ and @yuya@.
The @default@ branch tracks Redmine trunk (we carry out an actual SVN checkout on top of the repo and commit the entire .svn tree).
The @yuya@ branch contains the Redmine Mercurial overhaul patches from Yuya Nishihara described at "Redmine issue 4455":http://www.redmine.org/issues/4455. This branch is the one that is actually used in the "production" site, and we merge to it from default each time we update default from trunk.
The aim is to track the Redmine trunk until Yuya's Mercurial overhaul patches are merged into trunk, and then to stop tracking the trunk at the next subsequent stable release.
h2. How to update to Redmine trunk
Example: I start out doing some work in my test server, on the @cannam@ branch. I want to update the version of Redmine that my branch is based on.
The way we track Redmine SVN is simple but gross. We simply have all the .svn directories checked in to Hg, so the whole thing is a working SVN repository. We use the @default@ branch for tracking the upstream SVN -- this is its only function. Note in particular that we never, ever merge from Hg branches _to_ the @default@ branch. Arguably it should have a better name than @default@...
So. First, we clone a *new copy* of our repository. Why? Because there are some files in the live instance that we _don't_ keep in Hg, for example copyrighted fonts and some scripts and config files with database passwords in them. What we want to do is update the SVN code and then use @hg addremove@ to add to Hg anything that has appeared since we last updated. This won't work if we have additional untracked stuff in the directory as well, because all of it will be added too.
We'll clone our current copy rather than the master copy, because it's simpler -- then we just use the default target of @hg push@ to push back to the current copy for checking, before we push back to the remote master.
Our cloned copy is going to be very temporary so let's just do it in @/tmp@.
@/var/www/test-cannam$ cd@
@~$ cd /tmp@
@/tmp$ hg clone /var/www/test-cannam work@
@~$
@/tmp$ cd work@
Now make sure we're on the right branch:
@~/work$ @/tmp/work$ hg update default@
And update from trunk:
@~/work$ svn update@
Assuming that something actually changed, we can add and commit it:
@~/work$ hg addremove@
@~/work$ hg commit@
We now have the latest Redmine SVN trunk in our @default@ branch. Push the changes back to our normal working tree (remember this is the default push location because we cloned from there) and clean up:
@~/work$ hg push@
@~/work$ cd ..@
@~$ rm -rf work@
@~$ cd /var/www/test-cannam@
Our Redmine installation is made from a version maintained in an Hg repository (see "the Repository tab for this project":https://code.soundsoftware.ac.uk/projects/soundsoftware-site/repository).
This currently has two branches: @default@ and @yuya@.
The @default@ branch tracks Redmine trunk (we carry out an actual SVN checkout on top of the repo and commit the entire .svn tree).
The @yuya@ branch contains the Redmine Mercurial overhaul patches from Yuya Nishihara described at "Redmine issue 4455":http://www.redmine.org/issues/4455. This branch is the one that is actually used in the "production" site, and we merge to it from default each time we update default from trunk.
The aim is to track the Redmine trunk until Yuya's Mercurial overhaul patches are merged into trunk, and then to stop tracking the trunk at the next subsequent stable release.
h2. How to update to Redmine trunk
Example: I start out doing some work in my test server, on the @cannam@ branch. I want to update the version of Redmine that my branch is based on.
The way we track Redmine SVN is simple but gross. We simply have all the .svn directories checked in to Hg, so the whole thing is a working SVN repository. We use the @default@ branch for tracking the upstream SVN -- this is its only function. Note in particular that we never, ever merge from Hg branches _to_ the @default@ branch. Arguably it should have a better name than @default@...
So. First, we clone a *new copy* of our repository. Why? Because there are some files in the live instance that we _don't_ keep in Hg, for example copyrighted fonts and some scripts and config files with database passwords in them. What we want to do is update the SVN code and then use @hg addremove@ to add to Hg anything that has appeared since we last updated. This won't work if we have additional untracked stuff in the directory as well, because all of it will be added too.
We'll clone our current copy rather than the master copy, because it's simpler -- then we just use the default target of @hg push@ to push back to the current copy for checking, before we push back to the remote master.
Our cloned copy is going to be very temporary so let's just do it in @/tmp@.
@/var/www/test-cannam$ cd@
@~$ cd /tmp@
@/tmp$ hg clone /var/www/test-cannam work@
@~$
@/tmp$ cd work@
Now make sure we're on the right branch:
@~/work$ @/tmp/work$ hg update default@
And update from trunk:
@~/work$ svn update@
Assuming that something actually changed, we can add and commit it:
@~/work$ hg addremove@
@~/work$ hg commit@
We now have the latest Redmine SVN trunk in our @default@ branch. Push the changes back to our normal working tree (remember this is the default push location because we cloned from there) and clean up:
@~/work$ hg push@
@~/work$ cd ..@
@~$ rm -rf work@
@~$ cd /var/www/test-cannam@