[18:24] <cprofitt> here cjohnston
[18:24] <cjohnston> cprofitt: i have a bug for you if you like
[18:24] <cprofitt> sure.
[18:29] <cjohnston> cprofitt: bug #892436
[18:29] <ubot4> Launchpad bug 892436 in loco-team-portal "Broken link on http://loco.ubuntu.com/about/ (affects: 1) (heat: 8)" [Undecided,Confirmed] https://launchpad.net/bugs/892436
[18:31] <cprofitt> what is the new url?
[18:31] <cjohnston> ~ltp-devs
[18:34] <cprofitt> I may have to work on this when I get home...
[18:34] <cprofitt> I do not have my keys on my work machine
[18:34] <cjohnston> thats fine..
[18:34] <cjohnston> an easy way for getting you in and started though s what i figured
[18:35] <cprofitt> yes, then you can show me how to do the merge process
[18:35] <cprofitt> which is a step I have not done
[18:35] <cjohnston> not a problem
[18:35] <cjohnston> super easy
[18:35] <cjohnston> im not sure what my availability will be tonight but ping and ill try to be around
[18:36] <cprofitt> alright
[18:36] <cprofitt> I have a cub scout pack meeting to attend too
[18:37] <cprofitt> but I will try to ping you when I am free
[18:38] <cprofitt> wait...
[18:39] <cprofitt> cjohnston: is this the link on the wiki or inside the portal?
[18:39] <cjohnston> should be inside the portal
[18:39] <cjohnston> the team name changed
[18:39] <cjohnston> which should 404  alink or two
[18:40] <cprofitt> k
[18:45] <svwilliams> cjohnston, and cprofitt there are links to loco-directory-devs in the wiki too I think
[18:45] <cjohnston> svwilliams: ok.. if you guys run into them, please feel free to fix :-)
[18:46] <svwilliams> ok
[18:49] <cprofitt> cjohnston: I only found one example of that changed url
[18:49] <cjohnston> very possibly true
[18:49] <cprofitt> it was in /loco-directory/templates/about.html
[18:50] <cjohnston> we dont link to it alot afaik
[18:50] <cjohnston> and that is the right page
[18:50] <cprofitt> alright... so I will get setup at home later tonight and you can teach me the merge
[18:50] <cjohnston> the bzr part or the lp part or both
[18:51] <cprofitt> both
[18:51] <cprofitt> I have not done either
[18:51] <svwilliams> I should make sure I'm on for the lesson :-)
[18:51] <svwilliams> I haven't done it yet either
[18:51] <cprofitt> I know I have to change the file... then there is a process to upload it via bzr
[18:51] <cjohnston> svwilliams: you have done it all
[18:52] <cjohnston> you could teach it already
[18:52] <svwilliams> yup the light clicked on
[18:52] <cjohnston> i have the emails to prove it
[18:52] <svwilliams> he is talking about the up to lp
[18:52] <svwilliams> propose for merge
[18:52] <svwilliams> I was thinking a bzr merge
[18:52] <svwilliams> if that is even possible ... it is in git
[18:52] <cjohnston> ya.. he is talking about commit/push
[18:53] <svwilliams> ahh ok cprofitt if cjohnston's not on and I'm on I can try and help
[18:53] <svwilliams> I should be on tonight
[18:53] <cprofitt> sounds goog
[18:53] <cprofitt> good even
[18:53] <cprofitt> ;-)
[18:53] <cprofitt> I used bzr to pull the code... is it not on bazaar anymore?
[18:54] <cjohnston> cprofitt: it is
[18:54] <cprofitt> k
[18:55] <svwilliams> :-) sorry cprofitt we use git at work so I get confused by which system allows for each commands
[18:55] <svwilliams> all lp projects are bzr right?
[18:55] <svwilliams> except the kernal team
[20:55] <cprofitt> cjohnston: ping
[20:55] <cjohnston> sir
[20:55] <cprofitt> just about ready for some help if you have time
[20:56] <cjohnston> i have probably 8 minutes
[20:56] <cprofitt> looks like I need to make a new branch
[20:57] <cjohnston> ok.. so you already pulled it and made the changes?
[20:57] <cprofitt> pulled it, changes are seconds from happening
[20:57] <cjohnston> then you need to commit
[20:58] <cjohnston> bzr commit -m "enter text about your commit here"
[20:58] <cjohnston> then you would push
[20:58] <cjohnston> bzr push lp:~yourlpusername/loco-team-portal/some-name-or-bug-number-here
[20:59] <cjohnston> so if your working on bug # 123 bzr push lp:~cprofitt/loco-team-portal/123   would work
[20:59] <cprofitt> do I need to cd in to the loco-directory folder on my machien?
[21:00] <cjohnston> you can do it either in the directory that was created or the sub directories
[21:00] <cjohnston> its not specific
[21:01] <cprofitt> hmm... I get a connection error
[21:02]  * cprofitt looks at ssh keys
[21:02] <cprofitt> I wonder if I restored these
[21:04] <cprofitt> got that resolved
[21:04] <cprofitt> bzr: ERROR: Permission denied: "+branch/cprofitt/loco-team-portal/892436/": : Project 'cprofitt' does not exist.
[21:04] <cprofitt> do I need to register a branch first?
[21:05] <cprofitt> nvr mind
[21:05] <cprofitt> I see I was missing the ~ before my name
[21:05] <cprofitt> cjohnston: should be up ther enow
[21:05] <cprofitt> I see it
[21:06] <cprofitt> thanks for walking me through that
[21:08] <cprofitt> cjohnston: was that it?
[21:10] <cprofitt> mhall119: should I propose a merge or is that something you guys review and propose?
[21:11] <cjohnston> cprofitt: link it to the bug
[21:11] <cjohnston> then propose a merge
[21:11] <cjohnston> on the propse a merge page
[21:11] <cjohnston> there is a button for extra options
[21:11] <cjohnston> under extra options
[21:11] <cjohnston> fill out the commit message
[21:12] <cjohnston> i know it seems like your doing it twice, but if you have multiple commits to one branch, you need to do a commit message for the entire branch
[21:12] <cjohnston> we use Tarmac to do our merging for us, so without the commit message entered on LP, Tarmc wont work
[21:15] <cprofitt> k
[21:16] <cprofitt> do I choose a reviewer?
[21:16] <cjohnston> nope
[21:16] <cprofitt> and what do I fill out in the commit message?
[21:16] <cjohnston> just leave that blank
[21:17] <cjohnston> a description.. ex "Updated link to LoCo Team Portal Developers to reflect new URL."
[21:17]  * cjohnston is out
[21:17] <cprofitt> thanks cjohnston
[21:17] <cjohnston> if you have more questions, ill be back in a few hours
[21:17] <cjohnston> thank you cprofitt
[21:17] <cjohnston> sorry for rushing off
[21:17] <cprofitt> np