Time  Nick        Message
01:41 mtj         folks, is this a patch i could use for 3.16.x..
01:41 mtj         http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=13523
01:41 huginn      04Bug 13523: major, P5 - low, ---, benjamin.rokseth, Pushed to Stable , AddBiblio fails on mysql with STRICT_TRANS_TABLES
01:41 mtj         ..the reason i ask is the updatedb.pl bit
01:41 rangi       perhaps, it will fail with new mysqls .. i think its safe so probably yes would be my answer
01:42 rangi       but id check with whoever wrote it .. joubu i think?
01:42 mtj         i can see a situ. where a 3.16.x koha gets upgraded to 3.18... and this updatedb SQL is run twice
01:43 mtj         > ALTER TABLE biblioitems MODIFY COLUMN marcxml longtext
01:44 mtj         but then... having this specific sql run twice would not be a problem
01:45 mtj         (the sql removes any NOTNULL from marcxml column)
01:46 mtj         the patch does fix the bug on 3.16.x, too
01:48 mtj         hmm, i think its safe
01:49 mtj         i tested running the sql twice... no problems
01:50 mtj         cheers rangi
01:51 rangi       cool
01:58 dcook       eythian: Needs some work but I recall you expressing some interest when I mentioned Ansible and Koha: https://github.com/minusdavid/ansible-koha
01:58 dcook       Needs some tweaking but... it can work
01:58 dcook       Up there for people to use and improve
01:58 eythian     ah, cool
04:36 * magnuse   waves
05:26 mtompset    Have a great day, #koha. :)
05:35 dcook       Hmmm getting errors installing fr-FR for 3.18.5
05:36 dcook       Any translation folks around? I wouldn't mind fixing it
05:36 dcook       It looks pretty minor
05:39 dcook       H'okay, well I think I'll patch it locally and then report on bugzilla or the listserv or sutin
05:42 dcook       Debugging PO files in French is a million times easier than Arabic...
05:45 dcook       Maybe...
05:45 wahanui     maybe is a momentaneous error
06:14 magnuse     bbiab
07:35 drojf       morning #koha
07:43 magnuse     moin drojf
07:44 drojf       hei magnuse
08:02 alex_a      bonjour
08:11 atheia      Hi @Koha
08:17 cait        morning #koha
08:19 Joubu       good morning #koha
08:20 atheia      Morning cait, Joubu
08:21 gaetan_B    hello
08:21 wahanui     hello, gaetan_B
08:38 ashimema    Morning #koha
08:38 ashimema    morning atheia
08:39 cait        morning #koha
08:39 * magnuse   waves again
08:39 mveron      Good daytime #koha
08:40 mveron      @wunder Allschwil
08:40 huginn      mveron: The current temperature in Basel, Switzerland is 6.0°C (9:30 AM CET on March 26, 2015). Conditions: Mostly Cloudy. Humidity: 87%. Dew Point: 4.0°C. Windchill: 4.0°C. Pressure: 29.86 in 1011 hPa (Steady).
08:46 mveron      Hmm, strange link on Wiki: http://wiki.koha-community.org/wiki/Main_Page  :  lists.koha-community.org leads to "It works" / Go to BibLibre Mailing List
08:47 ashimema    @wunder stevenage, uk
08:47 huginn      ashimema: The current temperature in Pin Green, Stevenage, United Kingdom is 4.0°C (8:41 AM GMT on March 26, 2015). Conditions: Light Drizzle. Humidity: 93%. Dew Point: 3.0°C. Windchill: 1.0°C. Pressure: 29.50 in 999 hPa (Steady).
08:50 magnuse     @wunder boo
08:50 huginn      magnuse: The current temperature in Bodo, Norway is 0.0°C (8:50 AM CET on March 26, 2015). Conditions: Clear. Humidity: 44%. Dew Point: -11.0°C. Windchill: -7.0°C. Pressure: 30.04 in 1017 hPa (Steady).
09:00 Joubu       mveron: yes, should be http://lists.koha-community.org/cgi-bin/mailman/listinfo
09:02 Joubu       fixed
09:02 cait        mornign atheia, Joubu
09:03 mveron      Joubu: Works...
09:03 mveron      Hi everybody :-)
09:09 magnuse     @wunder oslo, norway
09:09 huginn      magnuse: The current temperature in Kikut, Oslo, Norway is -3.3°C (10:03 AM CET on March 26, 2015). Conditions: Heavy Snow. Humidity: 94%. Dew Point: -4.0°C. Windchill: -3.0°C. Pressure: 29.77 in 1008 hPa (Falling).
09:09 magnuse     it is snowing so heavy, all buses are cancelled, apparently
09:12 drojf       ouch
09:13 drojf       sounds like norwegian spring ;)
09:13 drojf       @wunder berlin, germany
09:13 huginn      drojf: The current temperature in Holzdorf, Germany is 7.0°C (10:05 AM CET on March 26, 2015). Conditions: Light Rain. Humidity: 93%. Dew Point: 6.0°C. Windchill: 5.0°C. Pressure: 29.71 in 1006 hPa (Steady).
09:13 drojf       light rain sounds like berlin spring :/
09:14 magnuse     :-)
09:14 magnuse     lots of sun ad blue sky in bodø ;-)
09:15 drojf       :)
09:22 nlegrand    Hey #koha
09:23 nlegrand    cait, ashimema I added some inputs on bug 13810, not sure if helping
09:23 huginn      04Bug http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=13810 normal, P5 - low, ---, gmcharlt, NEW , Prevent updatedatabase.pl from breaking because of case insensitive utf8 collation
09:23 magnuse     bonjour nlegrand
09:23 nlegrand    god morgen magnuse!
09:24 cait        nlegrand: not sure i understand it :)
09:30 magnuse     another day, another migration...
09:31 nlegrand    cait: ha sorry
09:32 nlegrand    cait: I think it's ashimema's fault.
09:32 * nlegrand  running away
09:32 cait        heh
09:32 nlegrand    ^^
09:37 * drojf     needs more caffeine
09:40 mveron      Opac search crashes with logged-in user - can somebody confirm?
09:40 mveron      No homebranch at /usr/share/kohaclone/C4/Reserves.pm line 2157.
09:40 mveron      I have a new user, he has a hoebranch... But crash..
09:41 mveron      homebranch
09:41 wahanui     homebranch is $a, as I recall.
09:49 magnuse     mveron: what version? master?
09:50 mveron      Yes, master. Strange, it worked yesterday.
09:54 mveron      Oh, yesterday I deleted an item wit a hold on it to test Bug 3873
09:54 huginn      04Bug http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=3873 normal, P5 - low, ---, jonathan.druart, Signed Off , Gracefully handle errors when item in staff client cart has been deleted
09:57 mveron      ...and the code dies with something like my $branchcode = $item->{homebranch} or die "No homebranch" on line 2157...
10:05 cait        mveron: it's the allowonshelfholds bug
10:05 cait        pushed yesterday
10:06 cait        bug 5786
10:06 huginn      04Bug http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=5786 new feature, P5 - low, ---, srdjan, Needs Signoff , Move AllowOnShelfHolds and OpacItemHolds system preferences to the Circulation Matrix
10:06 mveron      cait ++
10:06 magnuse     @karma cait
10:06 huginn      magnuse: Karma for "cait" has been increased 201 times and decreased 0 times for a total karma of 201.
10:06 magnuse     cait ++
10:06 magnuse     @karma cait
10:06 huginn      magnuse: Karma for "cait" has been increased 201 times and decreased 0 times for a total karma of 201.
10:06 magnuse     cait++
10:06 magnuse     @karma cait
10:06 huginn      magnuse: Karma for "cait" has been increased 202 times and decreased 0 times for a total karma of 202.
10:07 mveron      cait++ :-)
10:07 magnuse     :-)
10:07 mveron      @karma cait
10:07 huginn      mveron: Karma for "cait" has been increased 203 times and decreased 0 times for a total karma of 203.
10:07 magnuse     yay
10:09 cait        mveron: writing up a comment on the bug right now
10:15 mveron      Tested search issue with latest patch on bug 5786, seems to work OK now
10:15 huginn      04Bug http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=5786 new feature, P5 - low, ---, srdjan, Needs Signoff , Move AllowOnShelfHolds and OpacItemHolds system preferences to the Circulation Matrix
10:28 cait        mveron: culd you also check staff search?
10:28 cait        you beat me to writing up my comment :)
10:29 cait        mveron: and that the link 'place holds' displays like it should on search results?
10:32 mveron      cait: I have teh link "Place holds" next to the "Save" button, followed by "Tag"
10:32 cait        i think what the code does is hide it
10:32 cait        when you can't place a hold
10:32 cait        like when everything is available and you don't allow onshelfholds
10:33 cait        searchResults is also used in staff search - so would be good to check there is no problem there i think
10:34 cait        hm and t/db_dependent/Search.t
10:34 mveron      cait: Did a quick test, search worked in Staff
10:36 cait        and search in cataloguing... *reads code*
10:36 magnuse     xslt--
10:36 cait        i startd looking into it this morning.. bit worried about missing something again i think
10:41 mveron      cait: If I disallow RequestsOnOpac the link "Place holds" does not appear (as expected). But I can still place holds directly with something like ...cgi-bin/koha/opac-reserve.pl?biblionumbers=2, so you are right, it only hides the link
10:45 cait        yeah the logic is only for a variable hiding the link
10:45 cait        it shoudl also not display if the rules won't allow a hold
10:45 cait        turning off holds totally, or having no item on the record that can be placed on hold
10:49 khall       mornin all!
10:52 cait        morning khall
10:54 * mveron    is called for lunch
11:56 kivilahtio  Is it normal that MARC::Record->title() removes all other characters than [a-zA-Z] ??
11:56 kivilahtio  and then returns the field 245 components concatenated?
11:58 magnuse     kivilahtio: gmcharlt would be the definitive suorce on that, methinks
11:59 kivilahtio  magnuse: thanks.
11:59 magnuse     docs say "title() Returns the title from the 245 tag."
12:00 magnuse     "title_proper() Returns the title proper from the 245 tag, subfields a, n and p."
12:00 kivilahtio  magnuse: it actually says over that that there is no substiturion of sstrange characters
12:00 kivilahtio  Also note that no punctuation cleanup is done. If the 245a is "Programming Perl / ", then that's what you'll get back, rather than "Programming Perl".
12:01 kivilahtio  why do I get this behaviour why I am quite certain on other platforms it works well
12:01 kivilahtio  strange.
12:01 kivilahtio  I'll cook something up. Just a bit pissed...
12:04 kivilahtio  magnuse: thanks for your help!
12:07 Joubu       I hope nobody uses to use the reserve stats report...
12:07 Joubu       It returns random data...
12:08 kivilahtio  Joubu: :D
12:08 kivilahtio  Joubu: I guess it is better than no data?
12:08 Joubu       I don't think so
12:08 kivilahtio  Joubu: or not ...
12:09 kivilahtio  MARC::Record->publicationdate() is really helpful when publicatiopndate is "p1960". I get just "p" :)
12:10 kivilahtio  magnuse: Joubu: I have no familiarity with the workflow of getting modules into the CPAN or how to modify them. Do you have any idea where should I report this finding?
12:11 Joubu       kivilahtio: I think gmcharlt is the maintainer
12:11 kivilahtio  So I just email/irc him, there is no mechanism in cpan for that?
12:11 Joubu       kivilahtio: the cpan way is https://rt.cpan.org/Public/Dist/Display.html?Name=MARC-Record
12:12 kivilahtio  Joubu: thanks for the tip!
12:14 magnuse     kivilahtio: if you look at https://metacpan.org/pod/MARC::Record there are useful links on the left hand. but since gmcharlt is the maintainer and hangs out here, i would just talk to him first
12:15 kivilahtio  magnuse: Ill tryto replicate the issue first on another machine
12:16 magnuse     good plan :-)
12:27 kivilahtio  magnuse: as usual, it was my own fault. I had a "normalization" routine which removed all non-letters :) I should have slept more
12:42 p_vdk       Hi Koha
12:47 andreashm   hi
12:55 magnuse     kivilahtio: hehe
12:55 magnuse     MARC - wy u so weird?
13:11 kivilahtio  Subfield - cuz I got no contentz!
13:32 tcohen      morning!
13:34 tcohen      hi cait
13:34 magnuse     ¡hola tcohen!
13:34 tcohen      hola magnus
13:35 andreashm   hi
13:35 wahanui     hello, andreashm
13:41 magnuse     hiya andreashm
13:41 andreashm   tjenare magnuse
13:44 magnuse     hur är läget?
13:47 andreashm   magnuse: working on your Swedish? =)
13:47 andreashm   bara bra tack, själv?
13:50 magnuse     not too shabby - working on a migration - being reminded of what a terrible thing MARC is...
13:50 andreashm   magnuse: that happens more or less every day to me too. =)
13:51 andreashm   the marc thing... not the migration.
13:54 magnuse     :-)
13:59 andreashm   ah, I need some "fika"
14:04 misilot     Hi, is there a way to add the current date to the notices?
14:05 kivilahtio  do you have any recommendations for an OS issuetracker/project management tool to collaborate?
14:06 kivilahtio  Does bugzilla have any project management components?
14:06 kivilahtio  it's in Perl so it would be possible to extend
14:06 kivilahtio  and it might run on fastCGI
14:09 nlegrand    kivilahtio: I made some test some month ago and Redmine seemed to be descent. But my conclusion was that paper, pen and board fit my needs...
14:10 kivilahtio  nlegrand: thanks!
14:10 kivilahtio  nlegrand: what software did you compare?
14:11 nlegrand    I also looked at Trac and GLPI.
14:12 nlegrand    There are a lot of them: <http://en.wikipedia.org/wiki/Comparison_of_project_management_software>
14:12 nlegrand    I wanted it to be not in java, easy to install, easy to use, easy to browse or search.
14:13 nlegrand    And I wanted it to be fast as I didn't have time for it. Wasn't fast enough :).
14:17 cait        rdmine is ruby i think - we use it at work
14:17 nlegrand    cait: yes
14:17 ashimema    we just use trello.. ;)
14:18 ashimema    beats having somthing so 'big'
14:18 ashimema    for our cases anyways
14:22 cait        we use it as a tts
14:22 cait        mostly, and a bit of project management :)
14:26 jcamins     kivilahtio: I like Redmine pretty well. Way better than Jira.
14:27 kivilahtio  jcamins: that is a strong statement :)
14:27 kivilahtio  jcamins: why do you dislike Jira?
14:27 kivilahtio  doesn't anybody use Bugzilla?
14:27 kivilahtio  apart from Koha
14:27 kivilahtio  Koha community bugzilla
14:28 jcamins     kivilahtio: things you can't do in Jira: get a sense of all open issues' relationships with each other, close issues, find issues, delete accidentally-duplicated issues... find your own issues without issue number...
14:29 jcamins     I think Mozilla does.
14:29 cait        jcamins: wow
14:30 cait        what can you do with jira then? ;)
14:30 kivilahtio  jcamins: I think you can do all of them. You just have to classify your issues into version and components and subtasks
14:31 jcamins     cait: nothing.
14:31 wahanui     rumour has it nothing is a requirement, we have guidelines though
14:31 kivilahtio  jcamins: I think the workflow is pretty powerfull and customizable. The Agile plugin is pretty fine and the Tempo-plugin make logging work so much fun
14:31 kivilahtio  jcamins: and you can definetely close issues :)
14:31 kivilahtio  and deelte
14:32 kivilahtio  those are permission things
14:32 kivilahtio  but Jira costs a ton for unlimited use
14:32 jcamins     kivilahtio: yeah, it's just misconfigured.
14:32 jcamins     kivilahtio: not for F/OSS.
14:32 kivilahtio  jcamins: that is true. I was just hoping we could have atleast the funky worklogging in the next issue tracker
14:33 kivilahtio  jcamins: maybe we can just code and extension to Bugzilla
14:34 cait        worklogging?
14:51 magnuse     gah! end of the day and everything breaks down
14:52 magnuse     can't save 773t and w
14:52 magnuse     with norwegian translation, fieds in cataloguing screen show HASH(0x671e0d0)
14:53 magnuse     oh well, tomorrow is another day
14:53 magnuse     have fun, #koha
14:55 tcohen      bye magnuse
14:55 tcohen      hi cait
15:06 kivilahtio  hi tcohen!
15:06 tcohen      hi olli!
15:06 tcohen      how are you doing!
15:06 kivilahtio  busy
15:06 tcohen      s/\!/|?/
15:07 kivilahtio  all our friends in Finland are getting Koha and they are asking me a lot of questions on how to set it up
15:07 tcohen      that's awesome :-D
15:07 kivilahtio  also merging bibliographic records is very painful when merging databases
15:07 tcohen      i can imagine
15:07 kivilahtio  also Cucumber tests are way freaking awesome!
15:08 kivilahtio  also got this out while working with tests Bug 13906
15:08 huginn      04Bug http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=13906 enhancement, P5 - low, ---, chris, In Discussion , TestObjectFactory(ies) for Koha objects. Enable easy Test object creation from HASHes or from preconfigured test groups.
15:08 kivilahtio  and I bought the ring :)
15:08 kivilahtio  it is a black ring :)
15:08 kivilahtio  my father said that they make car engines out of those :)
15:10 tcohen      =D
15:10 tcohen      you did it eh, congrats
15:12 kivilahtio  thanks
15:12 kivilahtio  I saw your Koha video filmed in KohaCon 2014
15:12 kivilahtio  it is impressive
15:13 kivilahtio  not sure who made it but it was heart warming to see people talk about Koha
15:13 tcohen      so you liked it!
15:13 kivilahtio  it is just what people need to win hearts and minds
15:13 * tcohen    thought the same ;)
15:14 tcohen      I was amazed how fast it got subtitles for that many languages
15:14 tcohen      i.e. a couple days
15:14 tcohen      w are awesome
15:14 kivilahtio  we are !
15:17 Dyrcona     yep. That is a great video.
15:23 * cait      got recognized because of the video
15:23 cait        *grumps* :)
15:24 cait        i really love the music
15:24 andreashm   need to watch that again... don't remember the music.
15:25 cait        hm anyone had problems with reminder notices not being sent? old koha version... pre multiple message transports
15:25 cait        i wonder what i am missing here
15:27 kivilahtio  when I think of notices, all I get is agony. The interfaces are so hostile.
15:27 kivilahtio  but maybe one day things will change
15:28 kivilahtio  cait: did you check the message_queues-table?
15:28 cait        the message has not been generated
15:28 kivilahtio  cait: with reminder noties you mean overdue notices?
15:28 cait        but i have no idea why yet
15:29 cait        it shoudl have been and she got other reminders before
15:29 cait        and emails after
15:29 cait        no, the predue one
15:29 kivilahtio  cait: I share your pain
15:29 kivilahtio  ah ok
15:29 cait        message settng in the accoutn look right
15:29 cait        they use ldap - the email always has to be set and they can#t change it in theopac...
15:29 bag         morning
15:29 kivilahtio  evening
15:30 kivilahtio  cait: werent some users not targeted for certain types of reminders?
15:30 kivilahtio  have you tried perl -d advance_notices.pl ?
15:32 tcohen      kivilahtio: i heard you volunteered to set a cucumber server for the community?
15:33 tcohen      .-P
15:33 kivilahtio  tcohen: did I?
15:33 cait        hm -d?
15:33 kivilahtio  I will submit my cucumber tests oon and some implementations regarding the overdues rewrite.
15:33 tcohen      you probably don't remember
15:33 cait        i still have to calculate the date the notice shoudl have been sent
15:33 tcohen      too little proteine consumption and too much beer
15:33 tcohen      :-P
15:33 cait        and this is 3.12.9 :)
15:34 tcohen      bbl
15:34 kivilahtio  wow wowo, Al Jazeera just had a newspaper article about people from USA being unable to use  70%  of the protein they consume. Did you know that eating excessively protein will make your cells replicate even if they dont have to. Leading to all kinds of issues
15:34 kivilahtio  like cancer
15:35 kivilahtio  and aging
15:35 kivilahtio  tcohen: fyi :)
15:52 rocio       hey everyone! does anybody know if offline circ files trigger emails and notices? if a library normally sends out checkout slips via email, will the patrons get the notices once the record of the checkout is imported into Koha?
15:52 rocio       the library will be using offline circ all weekend
15:53 cait        rocio: i don't know
15:53 cait        maybe test with a one line test checkout?
15:54 rocio       ok!
15:56 fridolin    see u
16:06 nlegrand    kivilahtio: lack of protein fear is so weird when you know the facts, but it remains sadely a popular superstition :)
16:06 kivilahtio  nlegrand: Reminds me of an advertisement we had in Finland arounf the 1950's. "Icecream is fabulous and healthy. It uplifts the mood" Sponsored by the Finnish IceCream Union
16:08 Joubu       "I scream for an Ice cream" (seen in Cordoba :))
16:09 cait        ... and it has no calories right? because you need energy to warm it up? :)
16:09 nlegrand    :)
16:09 barton      nlegrand: that reminds me of a bit of German grafitti: "Wenn man an zu wenig Aluminum nicht krank wird, hat man ein Aluminumminimumimmunitat" -- "When you don't get sick from to little aluminum, you have an aliuminimminimumimmunity".
16:15 cait        oh noes.
16:15 cait        i can renew with an item level hold on the item?
16:15 cait        from another patron?
16:22 cait        bug 13919
16:22 huginn      04Bug http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=13919 major, P5 - low, ---, koha-bugs, NEW , Renewal possible with item level hold on item
16:22 cait        could someone take a look if it happens for them too?
16:38 Joubu       cait: looks ok for me on master
16:41 cait        testing on 3.18 AllowRenewalIfOtherItemsAvailable makes the difference
16:41 cait        noted on the bug
16:41 Joubu       (and not for me :-/)
16:41 cait        i can reproduce switching the pref
16:41 tcohen      hi Joubu
16:41 cait        on/off
16:42 cait        I will leave before i find more bugs
16:42 Joubu       hi / bye tcohen
16:43 Joubu       have to go :)
16:44 tcohen      ew
17:56 gaetan_B    bye
18:27 tcohen      bye #koah
18:27 tcohen      koha
19:01 mveron      good night #koha
20:19 andreashm   evening
20:24 wnickc      hi
20:24 wahanui     what's up, wnickc
20:59 andreashm   aaargh, struggling with git again.
21:08 cait        hi #koha
21:08 nengard     hiya cait
21:08 nengard     isn't it crazy late for you?
21:10 cait        not yet :)
21:10 cait        22:00
21:10 cait        22:10...
21:10 cait        and not at work tomorrow - 8 hour train trip for my distance study
21:14 andreashm   hi
21:14 andreashm   cait: oh, that doesn't sound like fu
21:14 andreashm   fun
21:14 cait        it's not so much - i haven't really spend time on it lately :(
21:15 cait        but there are 2 mandatory events each year - with lectures
21:20 andreashm   cait: trying to add bug 5786 to my kohadevbox cause I want to check it out, but git is telling me there are a bunch of merge conflicts. any ideas?
21:20 huginn      04Bug http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=5786 new feature, P5 - low, ---, srdjan, Signed Off , Move AllowOnShelfHolds and OpacItemHolds system preferences to the Circulation Matrix
21:21 wizzyrea    try a git am -3?
21:21 cait        hm it's already in master
21:21 wizzyrea    or that.
21:21 cait        it's probably telling you that it's applied
21:21 andreashm   oh.
21:21 cait        there is the last patch that still needs testing
21:21 cait        you can do a git bz apply... on a clean branch
21:21 wizzyrea    yeah, you'd need to skip all but the last one
21:21 cait        and then instead of yes say i = interactive
21:21 wizzyrea    and no through the first ones.
21:22 cait        and then commnt all lins with # but the last one
21:22 eythian     hi
21:22 * eythian   assumes that the source of cait's distance study is in Konstanz, so she must go 8 hours by train to get away from it.
21:22 andreashm   so I should go back to master and do the git bz apply from there? or add a new branch?
21:22 cait        heh
21:22 eythian     otherwise it wouldn't be distance...
21:23 cait        a new clean branch created from the master branch :)
21:23 andreashm   cait: alright, thanks!
21:32 andreashm   should I use # for the lines I want to apply, or not? I'm 'fused...
21:34 cait        not apply = #
21:35 andreashm   ack... same error.
21:36 cait        hm
21:36 cait        copy?
21:36 andreashm   Using index info to reconstruct a base tree... Falling back to patching base and 3-way merge... Auto-merging opac/opac-detail.pl CONFLICT (content): Merge conflict in opac/opac-detail.pl Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/admin/smart-rules.tt CONFLICT (content): Merge conflict in koha-tmpl/intranet-tmpl/prog/en/modules/admin/smart-rules.tt Auto-merging admin/smart-rules.pl CONFLICT (content): Merge conflict in admin/smart
21:37 cait        hm
21:37 cait        wrid
21:37 andreashm   (I guess that's what you meant... otherwise, sorry 'bout that)
21:37 cait        the last patch doesn't have changes to smart rules
21:37 cait        if you do a git status, is it clean?
21:38 andreashm   no changes or commits but I get some unmerged paths
21:38 cait        hm
21:41 andreashm   smart rules, reserves, opac-detail
21:41 andreashm   could possibly be something from my last applied patch? (bug 12768)
21:41 huginn      04Bug http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=12768 enhancement, P5 - low, ---, simith.doliveira, Signed Off , Replacement cost and processing fee management
21:42 andreashm   or mysql/updatedatabse.pl, I had some error about that previously tonight.
21:42 wizzyrea    I would abort it
21:42 wizzyrea    that's common.
21:43 wizzyrea    usually those are easy to merge.
21:43 wizzyrea    to merge you just edit the file noted
21:43 wizzyrea    look for the <<< indicators
21:43 wizzyrea    have a look at what's there, and get rid of what doesn't need to be there, and keep what does.
21:43 wizzyrea    sometimes you can't tell.
21:43 wizzyrea    but usually you can.
21:45 andreashm   wizzyrea: so I need to go and edit the four files mentioned in the unmerged paths?
21:46 wizzyrea    yep
21:46 wizzyrea    or
21:46 wizzyrea    you need to avoid it by figuring out what's going on with your branch (which is more likely, really)
21:47 cait        andreashm: hm is your master branch current?
21:47 cait        it's really strange it doesn't apply a bit
21:47 wizzyrea    I try never to do stuff on the master branch, to keep it clean.
21:47 wizzyrea    always always check out a new branch to apply patches on.
21:47 cait        yep - maybe there is something on it still from your testing the other branch
21:48 andreashm   cait: how do I check if its current?
21:48 cait        hm what does git log tell you?
21:48 andreashm   I try to checkout new branches, but since I really have no clue what I'm doing I'm probably messing up... a lot.
21:49 cait        heh
21:49 wizzyrea    it's ok, we were all there once.
21:49 wizzyrea    try this
21:49 wizzyrea    git checkout origin/master
21:49 wizzyrea    then git log
21:49 wizzyrea    what is the top commit?
21:49 wizzyrea    it should be http://git.koha-community.org/gitweb/?p=koha.git;a=commit;h=1410422ab65a7049411edab96d4ae0de454466ef
21:50 wizzyrea    if it's not that, you'll want to do a git fetch
21:50 andreashm   my top one is d4eb69bfab5a73cbd383537436603ef37fe16df9
21:50 wizzyrea    what's the description?
21:50 wahanui     it has been said that the description is scant though
21:51 cait        hm if oyu are master you could try a git reset --hard origin/master
21:51 cait        and then a git pull... maybe
21:51 wizzyrea    you can also ditch your master branch
21:51 wizzyrea    git checkout origin/master
21:51 wizzyrea    git branch -D master
21:51 andreashm   wizzyrea: Kyle's Fix language
21:51 wizzyrea    git checkout master
21:51 wizzyrea    then git fetch && git rebase origin/master
21:52 wizzyrea    git checkout -b master
21:52 wizzyrea    (to create a new master branch based on origin/master)
21:53 cait        i have to pack*grump* will be around more or less
21:53 wizzyrea    good luck
21:53 andreashm   cait: have fun!
21:54 andreashm   checkout origin/master gives me error: you need to resolve your current index first and lists the files that need to be merged
21:54 wizzyrea    ah yep
21:54 wizzyrea    so
21:54 wizzyrea    git status
21:54 wahanui     git status is a-ok
21:54 wizzyrea    what does it say?
21:54 cait        @wunder Dortmund
21:54 huginn      cait: Error: No such location could be found.
21:54 cait        @wunder Dortmund, Germany
21:54 huginn      cait: Error: No such location could be found.
21:54 cait        hm
21:55 cait        @wunder Bochum
21:55 huginn      cait: The current temperature in Dortmund, Germany is 4.0°C (10:50 PM CET on March 26, 2015). Conditions: Light Rain. Humidity: 87%. Dew Point: 2.0°C. Windchill: -1.0°C. Pressure: 29.74 in 1007 hPa (Rising).
21:55 cait        lol
21:55 cait        but you don't know dortmund, eh?
21:55 andreashm   wizzyrea: unmerged paths info
21:55 wizzyrea    git bz --abort maybe?
21:55 andreashm   ah, yes
21:55 wizzyrea    then git status
21:56 andreashm   same, but now I could do a git checkout origin/master
21:57 wizzyrea    and what does git status say now?
21:57 andreashm   changes not staged for commit: (the four files)
21:57 wizzyrea    right, git reset --hard HEAD
21:57 wizzyrea    should get rid of those
21:58 andreashm   wee, thanks wizzyrea!
21:58 wizzyrea    ^ this unstages everything to the latest head commit
21:58 wizzyrea    so use it carefully
21:58 wizzyrea    if you have a commit you don't like, (aside)
21:59 wizzyrea    you can say git reset --hard HEAD^ and this goes to the commit before the one on the tip
21:59 wizzyrea    with as many ^^^^ as commits back you want to go
21:59 wizzyrea    right so now you have an origin/master checked out?
21:59 wizzyrea    and it's clean and tidy and whatnot?
21:59 andreashm   seems so
21:59 wizzyrea    and the latest commit is that one from jonathan?
22:00 wizzyrea    or the one from kyle?
22:00 andreashm   jonathan
22:00 wahanui     jonathan is, like, there... But at the moment in a meeting
22:00 wizzyrea    cool
22:00 wizzyrea    so now
22:00 wizzyrea    git branch -D master
22:00 wizzyrea    git checkout -b master --track origin/master
22:00 wizzyrea    and now you have a tidy master branch again
22:01 wizzyrea    so now you can do
22:01 wizzyrea    git checkout -b bug-xxxx
22:01 wizzyrea    and git bz apply xxxx
22:01 wizzyrea    etc etc
22:02 wizzyrea    and if you get merge problems
22:02 wizzyrea    which, you may from time to time
22:02 wizzyrea    you can just git checkout master
22:02 wizzyrea    and be on your happy tidy master.
22:02 wizzyrea    if that makes sense.
22:05 andreashm   I believe so.
22:06 wizzyrea    git is tricky-ish
22:06 wizzyrea    and you'll stuff it up lots.
22:06 wizzyrea    but, it's fixable (usually)
22:06 andreashm   Yeah, I'm not really friends with git yet.
22:07 wizzyrea    git and I have had many heated discussions.
22:07 andreashm   haha!
22:07 andreashm   damn, same error when trying to apply the patch.
22:07 wizzyrea    right so
22:08 wizzyrea    this is an interactive git bz?
22:08 wizzyrea    i.e. you commented out all but the last patch when you were applying them
22:09 wizzyrea    or rather, you commented out everything  but the one labled [Signed-off] Bug 5786: Correction: Moved holdability check from opac-search.pl to searchResults()
22:09 huginn      04Bug http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=5786 new feature, P5 - low, ---, srdjan, Signed Off , Move AllowOnShelfHolds and OpacItemHolds system preferences to the Circulation Matrix
22:11 wizzyrea    otherwise you're applying the same patch over itself and that's icky.
22:11 andreashm   I marked the sign-offed one with a #.
22:11 wizzyrea    no no, mark the other ones with #
22:11 wizzyrea    :)
22:11 wizzyrea    # is a comment
22:11 andreashm   Ah.
22:11 wizzyrea    so git bz --abort
22:11 wizzyrea    and it should go back to sane
22:11 wizzyrea    if not, git reset --hard HEAD
22:12 wizzyrea    and try again, with all but the signed off one commented
22:12 andreashm   or should I use git bz apply --abort?
22:12 wizzyrea    try that first, for sure
22:15 andreashm   oh, I'm an idiot. now I get why the other ones were to be commented out. because they are already in master.
22:15 andreashm   cait said that 45 min ago, but it just now sunk in.
22:15 andreashm   I need some tea and feshly baked bread. luckily, I have just that.
22:15 wizzyrea    :)
22:16 wizzyrea    I knew you'd get there in the end. :)
22:19 andreashm   after very much ado. thanks for all your help!
22:19 andreashm   @wizzyrea++
22:19 huginn      andreashm: downloading the Perl source
22:20 andreashm   cait++
22:20 wizzyrea    no worries
22:30 p_vdk       o/ Good bye Koha
22:46 bag         @wunder 93111
22:46 huginn      bag: The current temperature in Eastern Goleta Valley, Santa Barbara, California is 28.2°C (3:46 PM PDT on March 26, 2015). Conditions: Clear. Humidity: 11%. Dew Point: -5.0°C. Pressure: 30.03 in 1017 hPa (Falling).
22:46 bag         hmm I was reading 30 outside my house
22:46 * bag       is melting
22:47 pianohacker oh, cool, when did that get shorter?
22:47 pianohacker @wunder 80401
22:47 huginn      pianohacker: The current temperature in 16 1/2 St & Washington Ave, Golden, Colorado is 16.9°C (4:44 PM MDT on March 26, 2015). Conditions: Mostly Cloudy. Humidity: 8%. Dew Point: -18.0°C. Pressure: 30.12 in 1020 hPa (Falling).
22:47 eythian     @wunder nzwn
22:47 huginn      eythian: The current temperature in Wellington, New Zealand is 16.0°C (11:30 AM NZDT on March 27, 2015). Conditions: Overcast. Humidity: 77%. Dew Point: 12.0°C. Pressure: 30.09 in 1019 hPa (Steady).
22:47 eythian     supposed to warm up a bit more today
22:47 pianohacker exactly the same weather!  (well, minus a small difference in humidity)
22:48 eythian     heh, just a minor one :)
22:50 dcook       @wunder syd
22:50 huginn      dcook: The current temperature in Sydney, New South Wales is 18.0°C (9:33 AM AEDT on March 27, 2015). Conditions: Clear. Humidity: 30%. Dew Point: 0.0°C. Pressure: 30.12 in 1020 hPa (Steady).
22:50 dcook       @wunder yqr
22:50 huginn      dcook: The current temperature in Regina, Saskatchewan is 3.0°C (4:00 PM CST on March 26, 2015). Conditions: Mostly Cloudy. Humidity: 70%. Dew Point: -2.0°C. Windchill: -2.0°C. Pressure: 30.26 in 1024 hPa (Steady).
22:50 dcook       Daaang
22:50 * dcook     is sometimes glad he lives in a warmer climate now
22:50 dcook       Even though 3 degrees isn't THAT cold. It's colder than I want to be right now :p
22:51 pianohacker @wunder den
22:51 huginn      pianohacker: The current temperature in Green Valley Ranch Golf Club, Denver, Colorado is 16.1°C (4:50 PM MDT on March 26, 2015). Conditions: Mostly Cloudy. Humidity: 26%. Dew Point: -3.0°C. Pressure: 30.06 in 1018 hPa (Falling).
22:51 pianohacker why is the airport 18 percent more humid?
22:51 dcook       There's a word play joke in there somewhere. I'm just not sure what it is.
22:52 pianohacker probably :)
22:52 pianohacker bye all
22:52 cait        dcook: additional languages?
22:52 wahanui     additional languages is http://wiki.koha-community.org/wiki/Installation_of_additional_languages_for_OPAC_and_INTRANET_staff_client
22:52 cait        dcook: the po files are generated using a script from the englisch templates and then translated using pootle - translate.koha-community.org
22:53 cait        fixes should be submitted on pootle - that's what marc did i tihnk
22:53 cait        they wlil be included in the next release
22:56 andreashm   ok, time for bed. bye all
23:00 dcook       cait: Thanks :)
23:01 dcook       So are the po files generated from scratch for every release? :S
23:01 cait        o god no
23:01 cait        we update them
23:01 dcook       How?
23:01 cait        but we do that for every release
23:02 cait        using the scripts - removed strings get removed, new strings get added... changed strings are changed...
23:02 dcook       Sweet. Nice script.
23:02 cait        cd misc/translator - perl translate update langcode or perl translate install langcode
23:03 dcook       Or koha-translate for the packages, yeah?
23:03 cait        yep
23:03 dcook       I got the installing part down :D
23:03 dcook       I can see why people dislike Pootle
23:03 dcook       It's a bit... unwieldy