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