[10:21] <daker> morning
[10:22] <nigelb> o/
[17:28] <cjohnston> mhall119: ping
[17:43] <mhall119> cjohnston: pong
[17:46] <cjohnston> mhall119: any chance of helping me write a test for the link on summit
[17:49] <mhall119> I have a call with my boss in a few, maybe after that I can steal some time for summit work
[17:49] <cjohnston> ok
[17:49] <cjohnston> and itd really help if we could get trunk working
[17:52] <cjohnston> nigelb: ping
[17:53] <cjohnston> nigelb: 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 work
[17:57] <cjohnston> mhall119: i just did a merge into 1.x that isnt in trunk
[17:58] <mhall119> so just merge 1.x into trunk
[17:58] <cjohnston> ok
[17:59] <mhall119> is trunk broken?
[17:59] <cjohnston> i think you said it was
[17:59] <cjohnston> after i removed migrations
[18:00] <mhall119> oh, there was an error during lpupdate
[18:00] <cjohnston> ya.
[18:00] <mhall119> I'm not sure that has anything to do with your migrations though
[18:00] <cjohnston> that
[18:00] <cjohnston> ok
[18:02] <cjohnston> mhall119: merging 1.x into trunk wont add back all the migrations?
[18:04] <mhall119> it shouldn't, since 1.x knows at which revision it diverged from trunk
[18:04] <mhall119> and vice versa
[18:04] <cjohnston> ok