[21:46] <bkerensa> ugh launchpad timing out when I need it to work
[21:46] <bkerensa> go figure
[21:51] <bkerensa> We will be in #ubuntu-meeting folks
[21:54] <dsmythies> Is this where the doc meeting will be, in a few minutes?
[21:55] <godbyk> dsmythies: It will be in #ubuntu-meeting
[21:55] <kotux> hi dsmythies
[21:55] <dsmythies> Then there will be confusion, because other notices say here.
[21:55] <bkerensa> #ubuntu-meeting
[21:55] <bkerensa> ^
[21:55] <bkerensa> go there :)
[21:55] <bkerensa> plz
[21:57] <bkerensa> Agenda: https://wiki.ubuntu.com/DocumentationTeam/MeetingAgenda
[21:57] <godbyk> Looks like the ' Business' heading is mangled a bit.
[21:57] <godbyk> not even sure if any of that still applies or not.
[21:58] <bkerensa> probably not
[21:58] <bkerensa> I through the agenda on top
[21:58] <bkerensa> meetings were in-frequent before
[23:01] <kotux> hey godbyk, I need to learn something
[23:01] <godbyk> kotux: What's that?
[23:02] <kotux> So, I worked on https://bugs.launchpad.net/ubuntu/+source/ubuntu-docs/+bug/1083937
[23:02] <ubot2`> Ubuntu bug 1083937 in ubuntu-docs (Ubuntu) "Ubuntu Desktop Guide keyring folder location wrong" [Undecided,In progress]
[23:04] <godbyk> Okay..
[23:06] <kotux> I've made the fix and I would like to merge it.
[23:06] <godbyk> Okay, so you've checked out the saucy branch and modified the file already?
[23:07] <kotux> Yes
[23:07] <godbyk> Have you committed and pushed your changes?
[23:07] <kotux> That's what I would like to know
[23:07] <kotux> :)
[23:09] <godbyk> Okay.
[23:09] <godbyk> In your saucy directory, run 'bzr status'.  What does that show?
[23:10] <kotux> give me a sec
[23:11] <kotux> bzr status
[23:11] <kotux> modified:
[23:11] <kotux>   ubuntu-help/C/tips-specialchars.page
[23:11] <kotux>   ubuntu-help/C/user-forgottenpassword.page
[23:12] <godbyk> Do the modifications for both pages apply to this bug or only the second page?
[23:12] <kotux> the tips* page is for a bug I reported.
[23:12] <kotux> No, only the second page page.
[23:13] <godbyk> Okay. The next step will commit the second file changes to your local bzr repository.
[23:13] <kotux> So I have two in queue for separate commits.
[23:13] <godbyk> Run:
[23:13] <kotux> But before I do that, is it possible I test the changes?
[23:14] <godbyk> bzr commit --fixes lp:1083937 -m 'A note here describing your fix. LP: #1083937'
[23:14] <ubot2`> Launchpad bug 1083937 in ubuntu-docs (Ubuntu) "Ubuntu Desktop Guide keyring folder location wrong" [Undecided,In progress] https://launchpad.net/bugs/1083937
[23:14] <kotux> I've been trying it, but trying to convert .page into html was such a hassle.  It didn't render some images when I viewed it in Firefox.
[23:14] <godbyk> I'm not sure if the validate script they mention applies to Docbook only or also to the Mallard stuff.
[23:15] <godbyk> So for now, we'll just commit it and whoever merges it can glance at it to make sure it looks okay.
[23:15] <kotux> Right, we could use a script that validates Mallard if it doesn't exist already.
[23:15] <kotux> ok
[23:15] <godbyk> Add that to our to do list. :)
[23:16] <godbyk> Did the bzr commit command go okay?
[23:17] <kotux> yes
[23:17] <godbyk> Great
[23:17] <godbyk> Now we're going to push the changes to a bzr repository on Launchpad.
[23:18] <godbyk> Since you don't have direct commit access to the ubuntu-docs repository, you'll have to push it to your own.
[23:18] <godbyk> Run the following:
[23:18] <godbyk> bzr push lp:~thinkndev/ubuntu-docs/saucy
[23:18] <pleia2> kotux: I didn't realize how many bugs there were, nice job
[23:18] <kotux> thanks pleia2.  There certainly was an unbearable amount.
[23:18] <godbyk> pleia2: Yeah, kotux has been blasting through them!
[23:19] <godbyk> kotux: The push may take a while since it has to upload all the files to Launchpad.
[23:20] <kotux> ok, btw, it's not going to reflect my tips-specialchars page right?
[23:21] <godbyk> kotux: Correct. Those changes won't be reflected until you commit and push them.
[23:21] <godbyk> kotux: Those changes will only exist on your local hard drive.
[23:22] <kotux> But this is what happened:
[23:22] <kotux> john@kotux:~/sdoc-1310/13.10_LP#1189280$ bzr commit --fixes lp:1083937 -m 'Updated the location of keyring folder. LP #1083937'
[23:22] <kotux> Committing to: /home/john/sdoc-1310/13.10_LP#1189280/
[23:22] <kotux> modified ubuntu-help/C/tips-specialchars.page
[23:22] <kotux> modified ubuntu-help/C/user-forgottenpassword.page
[23:22] <ubot2`> Launchpad bug 1083937 in ubuntu-docs (Ubuntu) "Ubuntu Desktop Guide keyring folder location wrong" [Undecided,In progress] https://launchpad.net/bugs/1083937
[23:22] <kotux> Committed revision 215.
[23:22] <kotux> john@kotux:~/sdoc-1310/13.10_LP#1189280$
[23:22] <kotux> It committed both modified pages, then the push.  :(
[23:23] <godbyk> kotux: Ah, whoops! My mistake.
[23:23] <godbyk> I forgot to have you specify just the one file.
[23:23] <godbyk> If you don't specify specific files, it commits everything by default.
[23:23] <kotux> Yeah, no worries.  How do I backtrack?
[23:23] <godbyk> We can roll that back, though.
[23:23] <godbyk> See if 'bzr uncommit' works.
[23:23] <kotux> 'roll back
[23:23] <godbyk> It may not since you've pushed already.
[23:24] <kotux> I was able to pull
[23:24] <kotux> uncommit
[23:24] <godbyk> Okay. What does 'bzr status' say now?
[23:25] <kotux> back to
[23:25] <kotux> john@kotux:~/sdoc-1310/13.10_LP#1189280$ bzr status
[23:25] <kotux> modified:
[23:25] <kotux>   ubuntu-help/C/tips-specialchars.page
[23:25] <kotux>   ubuntu-help/C/user-forgottenpassword.page
[23:25] <godbyk> Okay, run the same 'bzr commit' command as before but add 'ubuntu-help/C/user-forgottenpassword.page' to the end of the line so it only commits that one file.
[23:27] <godbyk> Once you've committed just the one file, you can run 'bzr push' to push the changes to Launchpad.
[23:28] <godbyk> You might get an error about diverged branches. If that happens, the simplest solution (in this situation, at least) is to delete your branch on Launchpad and then push a fresh copy again.
[23:28] <godbyk> (Actually, you can try 'bzr push --overwrite' if you get an error.. that might be enough to push it through.)
[23:30] <kotux> bzr push --overwrite worked
[23:31] <godbyk> Okay, great.
[23:31] <godbyk> Now find your branch on Launchpad and create a merge proposal.
[23:33] <kotux> cool.  Should I specify a reviewer?
[23:34] <godbyk> Nah, you can leave that blank.
[23:34] <godbyk> It'll email all of us
[23:35] <kotux> Ok, and in effect of the meeting today, I'm assuming you, ben, and doug will have commit rights.
[23:37] <godbyk> Everyone on the -committers team can commit: https://launchpad.net/~ubuntu-core-doc/+members#active
[23:38] <kotux> nvm, you guys are succeeding mdke
[23:41] <kotux> ok, guess I'm done for today.  Thanks for the help godbyk
[23:41] <godbyk> kotux: Thanks for all your hard work!  I'm merging your changes in now, so you might get a couple emails.