On Tue, Feb 19, 2013 at 5:26 PM, Nate Coraor <nate@bx.psu.edu> wrote:
On Feb 19, 2013, at 12:18 PM, Peter Cock wrote: Nate wrote:
Hi Peter,
This is due to the annoying way in which Mercurial handles symlinks. We're going to graft the changesets that caused this up to stable shortly, but in the meantime, you can do:
% rm static/june_2007_style % hg update stable --clean
This would remove any uncommitted local changes, if you had any, so it's not safe for all scenarios. But it's fine here since you're working on a fresh clone with no changes.
Cheers Nate, that trick seems to work.
I'm guessing this recent commit (11 days ago) is part of the issue: https://bitbucket.org/galaxy/galaxy-central/commits/506484344db3a370f8ae2409...
Indeed, that, and the previous commit.
I hope this won't require any 'grafting' for those of us working from the default branch? Will I be safe merging the 'default' into my own branch, or should I wait while you guys sort out whatever you need to do first?
It shouldn't require you to do anything. The only complications that should arise will be if you have changes to files under static/june_2007_style/
I've not touched that, so that's all good news - thank you :) Peter