zarathud:~/catalyst/koha$ git fetch --all← Previous day | Today | Next day → | Search | Index
All times shown according to UTC.
| Time | Nick | Message |
|---|---|---|
| 00:54 | wasabi left #koha | |
| 00:55 | alohalog left #koha | |
| 01:04 | chris_n1 joined #koha | |
| 01:39 | chris_n1 left #koha | |
| 02:06 | reva joined #koha | |
| 02:07 | reva | Good evening to anyone who is up and looking at this. |
| 02:16 | Braedon | 'evening |
| 02:19 | reva | When editing item records (that were generated by a serial subscription), the edit mode does not display the publication details (i.e., there is no column for enumera). So one has no idea which issue's item record one is editing. And when the edit click puts up the edit mode screen, there is nowhere one can tell there which issue's item record one is editing. |
| 03:15 | reva left #koha | |
| 03:20 | eric_b left #koha | |
| 03:34 | alohalog joined #koha | |
| 03:34 | wasabi joined #koha | |
| 03:53 | jcamins is now known as jcamins_a | |
| 04:18 | brendan left #koha | |
| 05:08 | wasabi left #koha | |
| 05:08 | alohalog left #koha | |
| 05:14 | alohalog joined #koha | |
| 05:15 | wasabi joined #koha | |
| 06:48 | davi joined #koha | |
| 09:53 | cait joined #koha | |
| 09:53 | cait | hi #koha |
| 10:50 | saorge joined #koha | |
| 11:02 | saorge left #koha | |
| 11:07 | saorge joined #koha | |
| 12:42 | miguelxer left #koha | |
| 13:20 | hdl joined #koha | |
| 13:48 | kmkale joined #koha | |
| 13:48 | kmkale | good evening all |
| 14:10 | kmkale left #koha | |
| 14:16 | hdl left #koha | |
| 15:28 | saorge left #koha | |
| 15:30 | saorge joined #koha | |
| 15:38 | hdl joined #koha | |
| 16:36 | hdl left #koha | |
| 16:39 | francharb joined #koha | |
| 16:40 | francharb left #koha | |
| 16:41 | hdl joined #koha | |
| 16:48 | chilts left #koha | |
| 16:49 | chilts joined #koha | |
| 16:57 | chilts left #koha | |
| 16:57 | chilts joined #koha | |
| 17:06 | chilts left #koha | |
| 17:06 | chilts joined #koha | |
| 18:10 | hdl left #koha | |
| 19:00 | chris_n1 joined #koha | |
| 19:02 | cait | hi chris_n1 |
| 19:22 | darling joined #koha | |
| 19:22 | richard joined #koha | |
| 19:22 | richard | hi |
| 19:25 | cait | hi richard |
| 19:25 | richard | hi cait |
| 19:25 | chris_n1 | heya cait |
| 19:26 | cait | hi chris_n1 |
| 19:26 | is this you or one of the many clones? :) | |
| 19:48 | wajasu left #koha | |
| 20:19 | cait | git expert around? |
| 20:20 | robin | Possibly, depending on what you need to know |
| 20:20 | cait | hi robin |
| 20:20 | robin | hi |
| 20:20 | cait | I set up a public git repository, I pushed myster and one of my branches |
| 20:21 | after that I noticed, that my branch was not up to date - so I rebased, and now I am not able to push | |
| 20:21 | and confused :) | |
| 20:22 | robin | ah |
| 20:22 | francharb joined #koha | |
| 20:22 | robin | yeah, that'll happen :) |
| 20:22 | francharb left #koha | |
| 20:22 | robin | if you want to force it, put a '+' before the branch name when you push |
| 20:22 | cait | is forcing it a good idea? |
| 20:22 | robin | but rebasing is something you should be very careful doing, in general |
| 20:23 | well, if someone else is using the repo, it may confuse them. | |
| 20:23 | But if not, it should be fine. | |
| 20:23 | cait | hm, nobody else is using it |
| 20:23 | robin | then you should be OK |
| 20:23 | cait | ok, it worked |
| 20:23 | robin | cool :) |
| 20:23 | cait | but what is the right way to do it? |
| 20:24 | and thx :) | |
| 20:24 | robin | usually do a pull then do a push |
| 20:24 | forcing is only needed if you change the history, which is what rebasing does. | |
| 20:25 | cait | hm |
| 20:25 | not sure I understand how this works | |
| 20:26 | if I do a git pull, I get the changes from git.koha-community.org? | |
| 20:26 | and can git push that to the public repository after that? | |
| 20:27 | robin | yes, I have both the git.k-c.org and the catalyst public on in my repo. I'll do things like: |
| 20:27 | git checkout kc/master -b my_branch | |
| 20:27 | work..work..work | |
| 20:28 | git push local_repo my_branch | |
| 20:28 | you can probably tell pull to pull from another branch | |
| 20:28 | * robin | checks the docs |
| 20:28 | robin | yeah, you can do |
| 20:28 | git pull some_repo | |
| 20:29 | or git pull some_repo some_branch | |
| 20:29 | if you want to change which one it uses by default, edit .git/config in the project directory | |
| 20:29 | (there are commands to edit it for you, but I don't know what they are) | |
| 20:30 | cait | ok, I will try to do that next time :) |
| 20:30 | thx robin | |
| 20:31 | robin | also handy if you working with multiple repos is 'git fetch --all', it's usually the first thing I do for the day. |
| 20:31 | you're welcome | |
| 20:31 | cait | and nothing will break? :) |
| 20:32 | hm git tells me it does not know the option --all | |
| 20:32 | robin | really? |
| 20:32 | like this: | |
| 20:32 | robinzarathud:~/catalyst/koha$ git fetch --all |
|
| 20:32 | Fetching origin | |
| 20:32 | Fetching kc | |
| 20:33 | what version are you on (git --version)? I have 1.7.0.4 | |
| 20:33 | cait | can you tell me how to check? |
| 20:33 | ah got it | |
| 20:33 | 1.6.3.3 | |
| 20:33 | robin | ah, that might be it |
| 20:34 | Are you on an older Linux version? | |
| 20:34 | cait | yep |
| 20:34 | older ubuntu, I always forget the name | |
| 20:35 | robin | oh right. It's usually worth upgrading :) |
| 20:36 | cait | will do, but it's only my vb, so not that bad |
| 20:36 | robin | The current one is 10.04, which is an LTS (so will be supported for a long time), 9.10 will be end-of-lifeing pretty soon I think. |
| 20:36 | vb? | |
| 20:36 | oh, virtualbox? | |
| 20:36 | cait | yes |
| 20:36 | hm still does not know git fetch --all | |
| 20:36 | robin | still, you get flashy new features :) |
| 20:36 | cait | oh, no newer version |
| 20:37 | I only use it for koha :) | |
| 20:37 | * robin | considers upgrading his work desktop to 10.10, which is coming out in about a week |
| 20:37 | cait | hm, I think I can't get a newer version with apt-get |
| 20:38 | robin | No, you can't very easily without upgrading the whole distro |
| 20:38 | cait | *sighs* |
| 20:38 | robin | however, just for getting --all it may not be worthwhile |
| 20:38 | cait | ok, but not today |
| 20:38 | robin | you can do git fetch one_repo and git fetch another_repo just fine |
| 20:38 | (I expect, anyway) | |
| 20:39 | cait | I will try it out |
| 20:39 | thx for your time :) | |
| 20:39 | my train leaves in 6 hours :( better get some sleep now | |
| 20:39 | robin | no problem, it's the "catch up on weekend email" phase of the day as it is, so not terribly busy right now :) |
| 20:39 | cya | |
| 20:40 | cait | cya and have a nice day :) |
| 20:47 | cait left #koha | |
| 21:12 | brendan joined #koha | |
| 21:14 | chris_n1 | for anyone interested, here is the latest output of my html label export option: http://imagebin.ca/view/HCMcpOv.html |
| 21:46 | robin left #koha | |
| 21:51 | robin joined #koha | |
| 21:52 | alan joined #koha | |
| 21:54 | robin left #koha | |
| 21:56 | robin joined #koha | |
| 22:17 | davi left #koha | |
| 22:19 | chris | http://library.hauraki-dc.govt.nz/ |
| 22:19 | richard | nice chris |
| 22:24 | chris | evonne did a great job on the design i reckon |
| 22:25 | richard | yeah it is pretty striking |
| 22:28 | CGI978 joined #koha | |
| 22:28 | CGI978 | hello everybody |
| 22:29 | brendan | hey chris that's really nice |
| 22:29 | CGI978 | hello brendan |
| 22:30 | brendan | hi |
| 22:30 | CGI978 | im dritan |
| 22:31 | im setting up koha federated system | |
| 22:31 | and i give permision to staff acces for each library | |
| 22:32 | but user can access the catalogue of the others library | |
| 22:32 | ca delete modifiy etc | |
| 22:33 | chris | do you have independentbranches switched on? |
| 22:33 | CGI978 | no |
| 22:33 | chris | switch it on |
| 22:33 | CGI978 | but i using multi opac |
| 22:33 | chris | thats only for hte opac, that doesnt do anything about staff permissions |
| 22:34 | if you want people to be able to only modify their own catalogue, then you need independentbranches on | |
| 22:39 | CGI978 | yes i have independentbranches |
| 22:39 | on | |
| 22:39 | but nothin they can modify | |
| 22:40 | the option singlebranch mode is of | |
| 22:51 | wajasu joined #koha | |
| 23:02 | CGI978 left #koha | |
| 23:09 | alan left #koha | |
| 23:10 | alan joined #koha | |
| 23:11 | alan left #koha | |
| 23:11 | alan joined #koha | |
| 23:51 | alan left #koha |
← Previous day | Today | Next day → | Search | Index
