cjohnstonmhall119: ping17:28
mhall119cjohnston: pong17:43
cjohnstonmhall119: any chance of helping me write a test for the link on summit17:46
mhall119I have a call with my boss in a few, maybe after that I can steal some time for summit work17:49
cjohnstonand itd really help if we could get trunk working17:49
cjohnstonnigelb: ping17:52
cjohnstonnigelb: you said you have some branches that you have done work on, (other than the ones that have been reviewed already).. what do you have that you have been working on so i dont start duplicating more work17:53
cjohnstonmhall119: i just did a merge into 1.x that isnt in trunk17:57
mhall119so just merge 1.x into trunk17:58
mhall119is trunk broken?17:59
cjohnstoni think you said it was17:59
cjohnstonafter i removed migrations17:59
mhall119oh, there was an error during lpupdate18:00
mhall119I'm not sure that has anything to do with your migrations though18:00
cjohnstonmhall119: merging 1.x into trunk wont add back all the migrations?18:02
mhall119it shouldn't, since 1.x knows at which revision it diverged from trunk18:04
mhall119and vice versa18:04
=== daker is now known as daker_

Generated by irclog2html.py 2.7 by Marius Gedminas - find it at mg.pov.lt!