Hi Jeremy,
I did not do any change/corrections! That's why I was puzzled that the
hg merging did not work... The files had just some '<<<<<<<<<<<<< local'
lines that I needed to remove... Sorry that I could not be more helpful
on this occasion.
Thanks,
Joachim
Joachim Jacob
Rijvisschestraat 120, 9052 Zwijnaarde
Tel: +32 9 244.66.34
Bioinformatics Training and Services (BITS)
http://www.bits.vib.be
@bitsatvib
On 01/14/2013 02:47 PM, Jeremy Goecks wrote:
I have only a faint clue why the packing did not work: I had manually corrected
some scripts (in static/scripts/viz/trackster), after merging failed during
updating.
I'm curious about what changes/corrections you made to Galaxy's scripts. Would
you be willing to share them?
Since those java scripts had been reflowed to have all the code on one line
(...), the merging obviously did not work out well...
In general, packing reduces the size of scripts so that they load more quickly.
As you noted, merging packed scripts does not work well at all since they are
all a single line. When you make changes to any Galaxy JavaScript files, you'll
need to repack the script(s) yourself.
Best,
J.
___________________________________________________________
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:
http://lists.bx.psu.edu/
