Re: [galaxy-dev] hg pull aborted

2013-01-04 Thread Rémy Dernat
Hi, Move the file 'doc/source/conf.py' to your /tmp directory outside galaxy, then "hg pull" / "hg update" / "hg merge". If that did not work download the file directory from repository and launch "hg pull/update". Regards 2012/12/13 Sarah Maman > Hello, > > When updating local instance of o

[galaxy-dev] hg pull aborted

2012-12-13 Thread Sarah Maman
Hello, When updating local instance of our Galaxy, the hg aborted: pulling from https://bitbucket.org/galaxy/galaxy-dist/ searching for changes adding changesets adding manifests adding file changes added 1482 changesets with 3989 changes to 1340 files abort: untracked file in working directory d