*** didymo has joined #schooltool | 01:11 | |
*** aelkner has quit IRC | 01:28 | |
*** aelkner has joined #schooltool | 01:37 | |
*** aelkner has quit IRC | 03:55 | |
*** aelkner has joined #schooltool | 04:24 | |
*** didymo has quit IRC | 06:23 | |
*** th1a has quit IRC | 06:59 | |
*** didymo has joined #schooltool | 08:25 | |
*** spowers has quit IRC | 09:29 | |
*** alga has joined #SchoolTool | 12:21 | |
*** ignas has joined #schooltool | 12:53 | |
*** didymo has quit IRC | 13:40 | |
*** lisppaste5 has quit IRC | 14:22 | |
*** lisppaste5 has joined #schooltool | 14:38 | |
*** mgedmin has joined #schooltool | 15:14 | |
*** th1a has joined #schooltool | 15:32 | |
*** alga_ has joined #SchoolTool | 15:37 | |
*** alga has quit IRC | 15:50 | |
*** alga_ has quit IRC | 16:22 | |
*** alga has joined #SchoolTool | 16:22 | |
aelkner | ignas: i sent an email regarding bzr. did you get it yet? | 18:39 |
---|---|---|
th1a | aelkner: You sent it to Jeff and me. | 18:42 |
aelkner | I thought i hit replay all | 18:42 |
aelkner | reply | 18:42 |
aelkner | i'll resne dit | 18:42 |
th1a | I'm just telling you what the header says. | 18:42 |
aelkner | it's true | 18:43 |
aelkner | it's because jeff was the last message on the thread, and he didn't send his message to all | 18:44 |
aelkner | th1a: can you run the same command on your machine that gave me that error? | 18:44 |
ignas | emm the url is wrong | 18:44 |
aelkner | hugh? | 18:44 |
ignas | it's more like bzr+ssh://bazaar.launchpad.net/~schooltool-owners/schooltool/schooltool.lyceum.journal | 18:45 |
ignas | not ~ignas | 18:45 |
aelkner | oh, you moved it | 18:45 |
ignas | I will be updating all the documentation soon | 18:45 |
ignas | as soon as they will release a new release candidate for bzr 1.5 that will allow me to fix the new bzr repository | 18:45 |
ignas | and have everything working | 18:45 |
aelkner | bzr co --lightweight bzr+ssh://bazaar.launchpad.net/~schooltool-owners/schooltool/schooltool.lyceum.journal | 18:46 |
aelkner | gave me the same error | 18:46 |
aelkner | so i need to wait | 18:46 |
aelkner | is there anything i can test out on that machine | 18:46 |
aelkner | a good repo? | 18:46 |
th1a | Works for me. | 18:46 |
th1a | I've got bzr 1.3.1 though. | 18:47 |
th1a | Does that server have Gutsy on it? | 18:47 |
ignas | https://launchpad.net/~bzr/+archive for the up to date bzr packages | 18:48 |
aelkner | how do i check if it's gutsy? | 18:49 |
ignas | cat /etc/lsb-release | 18:51 |
aelkner | i have machines that i'm trying this out on, one gutsy, one feisty | 18:52 |
aelkner | both are virtual servers | 18:52 |
aelkner | and both get the same failure | 18:52 |
aelkner | i'd like to try out fixing things on my virtual server | 18:53 |
aelkner | before i play around with things on sla's server | 18:53 |
aelkner | my server happens to be fiesty | 18:53 |
aelkner | but since gutsy also isn't working | 18:54 |
aelkner | i think it's ok to try the feisty machine first | 18:54 |
aelkner | igas: how do i use the web page you just sent | 18:54 |
aelkner | what do i edit | 18:54 |
ignas | /etc/apt/sources.list | 18:55 |
ignas | apt-get update then | 18:55 |
ignas | and apt-get install bzr | 18:55 |
aelkner | so i just add the two sources that the page has? | 18:56 |
aelkner | the file already has: | 18:56 |
aelkner | deb http://us.archive.ubuntu.com/ubuntu/ feisty-updates main restricted multiverse | 18:56 |
aelkner | deb-src http://us.archive.ubuntu.com/ubuntu/ feisty-updates main restricted | 18:56 |
aelkner | is there a conflict adding: | 18:57 |
aelkner | deb http://ppa.launchpad.net/bzr/ubuntu intrepid main | 18:57 |
aelkner | deb-src http://ppa.launchpad.net/bzr/ubuntu intrepid main | 18:57 |
aelkner | they both have main | 18:57 |
aelkner | i don't know what those lines mean | 18:57 |
ignas | no, no conflict | 18:57 |
aelkner | ok | 18:57 |
ignas | aelkner: you do realise that this is the same procedure users will perform when installing schooltool from our PPA ? | 18:57 |
aelkner | so that's good, right? | 18:58 |
th1a | It is the way it is done. | 18:58 |
th1a | But should he be using "feisty" instead of "intrepid"? | 18:58 |
ignas | yes | 19:00 |
aelkner | i can change that, but | 19:00 |
aelkner | i noticed something | 19:00 |
aelkner | i didn't see the beginning right before the traceback | 19:00 |
aelkner | here it is: | 19:01 |
aelkner | aelkner@alan:~/buildouts$ bzr co --lightweight bzr+ssh://bazaar.launchpad.net/~schooltool-owners/schooltool/schooltool.lyceum.journal | 19:01 |
aelkner | Permission denied (publickey). | 19:01 |
aelkner | bzr: ERROR: exceptions.AssertionError: end of file reading from server. | 19:01 |
ignas | oh | 19:01 |
ignas | ahh | 19:01 |
ignas | so you don't have your ssh private key | 19:01 |
ignas | set up | 19:01 |
aelkner | right | 19:01 |
aelkner | how do i do that? | 19:01 |
Lumiere | your user page | 19:01 |
ignas | Lumiere: he has it in launchpad | 19:02 |
ignas | he hasn't got it in .ssh/identity | 19:02 |
Lumiere | ah | 19:02 |
ignas | aelkner: can you do an svn+ssh checkout on that machine? | 19:03 |
aelkner | i'll try | 19:03 |
ignas | and can you do a bzr checkout from "http://bazaar.launchpad.net/~schooltool-owners/schooltool/schooltool.lyceum.journal" | 19:04 |
ignas | i can recall you had problems with http url in sla | 19:04 |
ignas | but if it's your own machine - it should work | 19:04 |
aelkner | i don't have the private key on my virtual server, so svn+ssh didn't work | 19:05 |
aelkner | i'll try with http | 19:05 |
aelkner | aelkner@alan:~/buildouts$ bzr co --lightweight http://bazaar.launchpad.net/~schooltool-owners/schooltool/schooltool.lyceum.journal | 19:06 |
aelkner | bzr: ERROR: Unknown branch format: 'Bazaar pack repository format 1 (needs bzr 0.92)\n' | 19:06 |
ignas | your bzr is too outdated for http access | 19:07 |
ignas | so either upgrade bzr or add a private key | 19:07 |
aelkner | i'm upgrading bzr now that i've change the sources lines to be feisty... | 19:09 |
aelkner | something good is happening | 19:10 |
aelkner | yeh, it worked | 19:10 |
aelkner | i'm going to try the same steps on sla's machine | 19:10 |
aelkner | ignas: should i change intrpid to gutsy as i changed it to feisty on the other machine? | 19:12 |
ignas | yes | 19:12 |
ignas | but with sla - you can't use http url from what i can recall, because of the proxy bug, so you might have to set up your ssh key even after bzr upgrade | 19:13 |
aelkner | what proxy bug? | 19:15 |
ignas | emm, the one that was preventing you from checking out from http://staging.schooltool.org/bzr2/schooltool/schooltool.lyceum.journal/trunk | 19:18 |
ignas | some time ago | 19:18 |
ignas | aelkner: http://schooltool.pov.lt/irclogs/%23schooltool.2008-04-09.log.html#t2008-04-09T20:41:15 | 19:19 |
aelkner | so the log suggests that i have to use bzr+ssh | 19:26 |
aelkner | ignas: is that right? | 19:26 |
ignas | if you are under a proxy | 19:26 |
ignas | and i think the problem was that SLA is under a proxy | 19:26 |
ignas | under a broken outdated version of squid | 19:26 |
ignas | from what i can recall | 19:27 |
aelkner | that could be | 19:27 |
ignas | so in SLA you should use bzr+ssh urls to checkout stuff | 19:27 |
aelkner | the sysadmin there was a reall bad one | 19:27 |
ignas | and to do that - you have to have you ssh keys set up properly in there, which hopefully you already have | 19:27 |
aelkner | i don't yet | 19:27 |
aelkner | and i forget how to do that | 19:27 |
aelkner | do you have instructions for seeting up a ssh key | 19:28 |
ignas | Lumiere: maybe you could explain it, i am not sure i know the *right* way | 19:30 |
ignas | I am just copying my private key to the machine | 19:30 |
ignas | or using | 19:30 |
ignas | ssh -A | 19:30 |
ignas | ssh -A some_host | 19:30 |
ignas | will make your key available in there as well i think | 19:30 |
ignas | so you ssh -A your_sla_host and use ssh+bzr:// | 19:31 |
ignas | and it should probably work | 19:31 |
ignas | i am not 100% sure though | 19:31 |
ignas | just guessing | 19:31 |
ignas | http://sial.org/howto/openssh/publickey-auth/ is the howto | 19:31 |
ignas | Agent Forwarding part is the one that should be enough | 19:32 |
aelkner | ignas: i don't know why, but after doing the ppa steps, i was alble to bzr with http | 19:32 |
ignas | cool | 19:32 |
ignas | maybe they fixed it | 19:32 |
aelkner | maybe the bzr folks fixed teh proxy bug? | 19:33 |
aelkner | oh, you just said that | 19:33 |
aelkner | so, anyway, that's great new | 19:34 |
aelkner | news | 19:34 |
aelkner | ignas: how soon will your port to bzr be ready for me to work with? | 19:34 |
ignas | hmm, hopefully tomorrow | 19:35 |
ignas | how soon will i document it enough so you could work with it is another question though | 19:35 |
ignas | work efficiently that is | 19:36 |
aelkner | isn't it just a matter of changing my make files to point to the bzr repos rather than the svn ones? | 19:36 |
ignas | oh, for that - yes | 19:37 |
ignas | that will work tomorrow, i am talking about all the commiting process | 19:37 |
ignas | that we will have to work out somehow | 19:37 |
ignas | and nightlies and releases | 19:37 |
aelkner | when you say committing process, do you mean i won't be able to bzr ci? | 19:39 |
ignas | don't know at the moment, a good practice would be - not doing bzr ci, at least to schooltool/trunk | 19:41 |
ignas | i will have to allow you to do that for schooltool.gradebook i guess, just to keep the transition less painful ;) | 19:41 |
aelkner | why is this have to be so painful? | 19:44 |
aelkner | i mean, why are we even doing this if it's such a pain | 19:45 |
aelkner | svn worked great | 19:45 |
ignas | to you - yes | 19:45 |
ignas | you did not spend most of the sprint integrating changes from 5 programmers | 19:45 |
ignas | that forget to svn add files every once in a while | 19:46 |
aelkner | and bzr would not cause problems when someone forgets to bzr add? | 19:47 |
ignas | yes, and not cause problems when someone updates their patch, or wants to add 2 different features | 19:48 |
ignas | and has no commit access | 19:48 |
aelkner | ok, i'll stop complaining | 19:49 |
aelkner | there isn't anything we could do now to back up the road we've gone on anyway | 19:49 |
th1a | aelkner: Ultimately you want to use a different workflow with a distributed revision control system. | 19:49 |
th1a | The whole point is to merge separate branches rather than just having everyone check in to trunk. | 19:50 |
ignas | yeah, and we will have to learn that workflow | 19:50 |
ignas | feature branches while cumbersome, add organisation | 19:50 |
aelkner | i guess we will | 19:50 |
ignas | backporting single diffs from the past to the release branch | 19:50 |
ignas | is something that is a maintainance nightmate | 19:51 |
ignas | and as we have a release branch, we will have to do that sometimes | 19:51 |
ignas | doing feature/bugfix branches while mandatory in bzr, is a lot easier than in svn | 19:52 |
ignas | and is recomended anyway | 19:52 |
aelkner | i never had to backport, so excuse me if i don't see the benefits | 19:53 |
aelkner | but i understand that you certainly have had to deal with that | 19:54 |
aelkner | ignas: so are you saying that i won't be able to make changes and commit with the ease that i have had to date? | 19:54 |
aelkner | all i had to do was svn ci | 19:55 |
ignas | aelkner: yes and no | 19:55 |
ignas | aelkner: if you will work on your own branch, you will be able to bzr ci as much as you want | 19:55 |
ignas | aelkner: if you will be using trunk - you will not or at least should not commit to it unless you really need that and have a very good reason | 19:56 |
aelkner | i always will have a need to commit and then switch to the sla server to update | 19:56 |
aelkner | that will be a daily process | 19:56 |
th1a | Basically ignas will integrate your changes from your branch to trunk. | 19:56 |
ignas | for sla - you can do that | 19:56 |
ignas | just keep on doing it the way you did | 19:56 |
ignas | for schooltool/trunk | 19:56 |
ignas | you will branch schooltool trunk | 19:57 |
ignas | push it to launchpad | 19:57 |
ignas | commit your new code there | 19:57 |
ignas | and use your branch in sla | 19:57 |
ignas | and when you will get your changes into a good state - you will just ask me to integrate your changes back to trunk | 19:57 |
aelkner | my changes are always in a good state | 19:57 |
aelkner | i wouldn't commit them otherwise | 19:58 |
ignas | though sometimes we have discussions whether implement a feature one way or another ... | 19:58 |
ignas | actually the prefered workflow is a bit more complicated | 19:59 |
ignas | you would have your own branch | 19:59 |
ignas | and a feature branch for the feature | 19:59 |
ignas | so when you are done with the feature | 19:59 |
ignas | you merge it to your own branch for deployment | 19:59 |
ignas | i merge it to trunk later | 19:59 |
ignas | and then if th1a wants me to | 19:59 |
ignas | i merge it to our release branch | 19:59 |
ignas | for features - no need for that probably, but for bugfixes it's the recomended way of doing it | 20:00 |
aelkner | i don't know who's dong all this recommending, but... | 20:00 |
aelkner | if it makes you happy to hold my changes out from the release branch | 20:00 |
aelkner | and i can just deliver my fixes to sla using my own branch | 20:01 |
aelkner | then fine | 20:01 |
th1a | It isn't so much that you need bzr to manage the contributions of your two main developers. | 20:02 |
th1a | It is more of a benefit for everyone else. | 20:02 |
ignas | th1a: making backporting bugfixes to the release sane is actually for my benefit | 20:02 |
th1a | Sure. | 20:03 |
aelkner | as long as you don't mind backporting my frequent changes... | 20:03 |
ignas | trying to recall whether you have merged revisions 7765 to 7767 to the release already is something i don't want to do again | 20:03 |
ignas | aelkner: we will work it out, it will take time, it will be different ... | 20:04 |
aelkner | i'm guessing it will be much better, or you wouldn't have recommended it | 20:04 |
aelkner | i'm just slow to adjust to ripping out a nice workflow i had going | 20:05 |
aelkner | features and bugfixes will be slower to come in the short term as i spend more timje on this than on them | 20:05 |
aelkner | ignas: do me a favor and send me an email when you know that i can get started on using bzr | 20:06 |
aelkner | after you've worked out the kinks | 20:06 |
ignas | ok, i'll try to come up with some instructions | 20:06 |
ignas | like how to get a development sandbox | 20:06 |
aelkner | i'll continue to use svn until then | 20:06 |
ignas | properly set up | 20:07 |
aelkner | and i realized that it won't be hard for me to move my code to a bzr version | 20:07 |
aelkner | instead of worrying about apply patches | 20:07 |
aelkner | i can just copy the files in | 20:07 |
aelkner | revision history be damned | 20:07 |
aelkner | i never use it anyway | 20:07 |
ignas | you can, but that's more error prone actually | 20:08 |
aelkner | it's not like i'm wokring on a project with multiple collaborators | 20:08 |
aelkner | why? | 20:08 |
ignas | you can miss a file or two | 20:08 |
aelkner | how? | 20:08 |
ignas | cp -r will include .svn directories too | 20:08 |
ignas | i think | 20:08 |
ignas | which is another problem | 20:08 |
aelkner | i can copy files one at a time | 20:09 |
aelkner | that's no prob | 20:09 |
aelkner | because there will only be 5-10 to copy | 20:09 |
aelkner | taking only a minute | 20:09 |
aelkner | so no .svn stuff | 20:09 |
ignas | by the way - never assume your code will not be used/developed by someone else | 20:09 |
aelkner | sound good | 20:09 |
aelkner | i think it's a safe bet | 20:10 |
aelkner | if they wanted to use it at this time | 20:10 |
aelkner | they would be more in trouble than me | 20:10 |
aelkner | so i wouldn't waste time worrying about them | 20:10 |
ignas | well - it's your choice | 20:10 |
aelkner | besides, it's not ready yet for the world | 20:11 |
aelkner | it's still in beta at sla, and many changes will follow | 20:11 |
ignas | version history is something that has helped me find and fix so many bugs, that i am considering it quite important | 20:11 |
aelkner | actually, copying the files as i suggest will not ruin the revision history | 20:12 |
aelkner | it will just put all of the revisions in one diff | 20:12 |
aelkner | and hopefully you'll have the workflow nailed down soon | 20:13 |
aelkner | so it won;'t be such a big diff | 20:13 |
*** ignas has quit IRC | 20:23 | |
*** fsufitch has joined #schooltool | 20:48 | |
*** mgedmin has quit IRC | 20:50 | |
*** alga has quit IRC | 21:22 | |
*** alga has joined #SchoolTool | 23:00 |
Generated by irclog2html.py 2.15.1 by Marius Gedminas - find it at mg.pov.lt!