[01:47] Paragraphs don't show up properly for me (e.g. http://doc.bazaar.canonical.com/bzr.dev/en/user-reference/add-help.html). There's no spacing between paragraphs, which makes it hard to read. How would I go about setting up a server to see what might need to change to clean things up? [01:51] I've got the bzr repo from launchpad and can see the help information in builtins.py, so I think I need information about how the whole documentation build and test works. [01:52] dwg_, running 'make docs-sphinx' should show you the output [01:52] you may need to fix doc_generate/something [01:52] then please push your branch to launchpad and propose it for merge [01:56] make docs-sphinx at least does something, so that ought to get me started. thanks! === Meths_ is now known as Meths [21:30] Why the hell is bzr telling me about text conflicts in files *I DIDN'T CHANGE*? [21:33] I have a copy of the Emacs trunk. I last updated it --- hrm, maybe a month ago? [22:14] mornin all :) [22:22] Hey folks. I'm about to create a branch on my launchpad page, and I'm a little confused on what to call it. Should one call it the project name, dev, trunk, mainline, branch, or what? The UI seems a little confusing to me. [22:27] hi [22:28] i've made some changes on a python file, how do I upload it to launchpad? [22:28] I already have the thing called trunk visible [22:29] and I have some testing files there [22:29] KombuchaKip: 'trunk' is a reasonable default. It doesn't matter much. You can rename it later (at the cost of breaking the old URL, of course). [22:30] spiv: Thanks. [22:30] I forgot the command sequence to upload my changes [22:30] blueglasses: usually "bzr commit" followed by "bzr push". [22:31] trying... [22:31] spiv: What does Launchpad mean when they refer to the "trunk series"? [22:31] commit opened nano [22:32] is this expected? [22:32] you get to type in what your change does. [22:32] so people looking at the log know what you were up to. [22:33] do I have to follow rules to comment on the commit? [22:34] eg, is there a all people do this thing when typing what my change does? [22:35] or is it freestyle? [22:35] depends on the project, but this is publicly visible [22:35] blueglasses: it's a place for you to describe/summarise the changes, so that people (including yourself) can look at just that message (via e.g. "bzr log") rather than having to look at the exact changes. It's freestyle. [22:36] when in doubt, try and do the same kind of thing you see others doing when you look at the existing commit messages in the log [22:36] ...is there not a "My First Contribution" guide on launchpad somewhere? [22:37] KombuchaKip: perhaps better to ask in #launchpad. https://help.launchpad.net/Projects/SeriesMilestonesReleases may help. [22:37] spiv: Thanks spiv. I didn't realize there was a channel. [22:37] KombuchaKip: not a problem. [22:38] thank you [22:44] how do i configure the project branch in lauchpad? it says the word for my project is too small [22:45] but its already there... [22:45] its called story [23:44] is launchpad lagging behind on the bzr branch a known issue? [23:45] I can branch spiv's r5538 but the latest rev on the web page is 5537 and the +activereviews page hasn't twigged it's already been merged. [23:51] mgz, it might be related to an issue with the branch scanner on the weekend [23:52] mwhudson: what do you think?