As it turns out, it was fairly simple to install a newer hg version (2.4.2).
So now running hg merger --preview and hg heads returns:
$ hg merge --preview
abort: branch 'default' has one head - please merge with an explicit rev
(run 'hg heads' to see all heads)
[galaxy@galaxy galaxy-dist]$ hg heads
user: jeremy goecks <jeremy.goe...@emory.edu>
date: Mon Jan 28 16:36:02 2013 -0500
summary: Language improvements for tophat wrappers.
ITS - Research Computing Center
University of North Carolina at Chapel Hill
From: Paul Boddie [paul.bod...@biotek.uio.no]
Sent: Tuesday, January 29, 2013 12:01 PM
To: James Taylor
Cc: Waldron, Michael H; Greg Von Kuster; galaxy-...@bx.psu.edu
Subject: Re: [galaxy-dev] Error trying to add tools from tool shed respository
On 29/01/13 17:33, James Taylor wrote:
> Wasn't sure of the order, those are definitely after running the
> update. Dannon's advice makes a good point, upgrading to the latest
> mercurial should help.
If upgrading Mercurial will involve introducing another detour, you
could potentially check which version of the Galaxy code you're using
now as defined by the "parent" revisions:
This (or these in certain cases) might not be a repository "head" and
thus won't appear in "hg heads". If you have the graphlog extension
enabled, running the following might be informative as it should show
you where you are (with a "@" symbol) in the code history:
hg glog | more
If you don't want to risk your working directory, you could first clone
it to make something that you can then experiment with:
hg clone . ../galaxy-dist-test
Then, you'd move into this clone:
You might need to update to the version previously printed by "hg
hg update <revision>
One might then assume that any desirable update would involve getting to
the "tip", and so you could try a merge with that:
hg merge tip
If all of this works reasonably, you should be able to do the same merge
on your real working directory (and can thus delete the test directory).
The result of any merge will need to be committed:
Anyway, these are just some thoughts. The crucial point is that you can
clone the repository and then work with the clone, discarding it if your
experiments go wrong. Doing this might be quicker than having to get a
more recent Mercurial version installed.
Please keep all replies on the list by using "reply all"
in your mail client. To manage your subscriptions to this
and other Galaxy lists, please use the interface at: