I recently took a probably more labour intensive approach.
# mv prev-installation to somewhere else
# git clone to old-location
# git checkout -b master origin/master
# and copy over every config, tool xml, tool dependency directory,
tool-data loc files from the prev-installation to the new git one
# add your own code changes if you have any that you want to keep
# ./run.sh or manage_db.sh upgrade
# check log and probably copy some more missing files
The upside for me was that I could finally remove all the junk that our
installation has been collecting for the last couple of year.
On Tue, Jul 21, 2015 at 12:45 PM, Jochen Bick <jochen.b...@usys.ethz.ch>
> Thanks Marius,
> it does not look like it's working for me. There are to many changes in
> git diff...
> the git pull and cat local_changes.diff |patch -p1 -R gives me an
> endless list of differences.
> Cheers Jochen
> On 21.07.2015 11:41, Marius van den Beek wrote:
> > Hi Jochen,
> > I recently did this. Instructions are here:
> > https://wiki.galaxyproject.org/Develop/SourceCode
> > This has worked for me:
> > (~/galaxy-dist is my production galaxy dir)
> > cd ~
> > git clone https://github.com/galaxyproject/galaxy.git
> > cd galaxy
> > git reset --hard 3f1cec451f6dadee52a70a14fc6f6899f7aacdae
> > cd ~/galaxy-dist
> > hg update 17115
> > mv .hg .hg_backup
> > cp -R ~/galaxy/.git .
> > git pull (at this point I got a merge error!)
> > so I did:
> > git diff > local_changes.diff
> > cat local_changes.diff |patch -p1 -R
> > git pull
> > git checkout release_15.05
> > Best,
> > Marius
> > On 21 July 2015 at 11:36, Jochen Bick <jochen.b...@usys.ethz.ch> wrote:
> >> Hi,
> >> is it possible to change from bitbucket to git? So I would like
> >> future-update my galaxy from git instead from bitbucket.
> >> Cheers Jochen
> 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:
> To search Galaxy mailing lists use the unified search at:
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:
To search Galaxy mailing lists use the unified search at: