[01:47] <dwg_> 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] <dwg_> 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] <poolie> dwg_, running 'make docs-sphinx' should show you the output
[01:52] <poolie> you may need to fix doc_generate/something
[01:52] <poolie> then please push your branch to launchpad and propose it for merge
[01:56] <dwg_> make docs-sphinx at least does something, so that ought to get me started. thanks!
[21:30] <quotemstr> Why the hell is bzr telling me about text conflicts in files *I DIDN'T CHANGE*?
[21:33] <quotemstr> I have a copy of the Emacs trunk. I last updated it --- hrm, maybe a month ago?
[22:14] <peitschie> mornin all :)
[22:22] <KombuchaKip> 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] <blueglasses> hi
[22:28] <blueglasses> i've made some changes on a python file, how do I upload it to launchpad?
[22:28] <blueglasses> I already have the thing called trunk visible
[22:29] <blueglasses> and I have some testing files there
[22:29] <spiv> 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] <KombuchaKip> spiv: Thanks.
[22:30] <blueglasses> I forgot the command sequence to upload my changes
[22:30] <spiv> blueglasses: usually "bzr commit" followed by "bzr push".
[22:31] <blueglasses> trying...
[22:31] <KombuchaKip> spiv: What does Launchpad mean when they refer to the "trunk series"?
[22:31] <blueglasses> commit opened nano
[22:32] <blueglasses> is this expected?
[22:32] <mgz> you get to type in what your change does.
[22:32] <mgz> so people looking at the log know what you were up to.
[22:33] <blueglasses> do I have to follow rules to comment on the commit?
[22:34] <blueglasses> eg, is there a all people do this thing when typing what my change does?
[22:35] <blueglasses> or is it freestyle?
[22:35] <mgz> depends on the project, but this is publicly visible
[22:35] <spiv> 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] <mgz> 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] <mgz> ...is there not a "My First Contribution" guide on launchpad somewhere?
[22:37] <spiv> KombuchaKip: perhaps better to ask in #launchpad.  https://help.launchpad.net/Projects/SeriesMilestonesReleases may help.
[22:37] <KombuchaKip> spiv: Thanks spiv. I didn't realize there was a channel.
[22:37] <spiv> KombuchaKip: not a problem.
[22:38] <blueglasses> thank you
[22:44] <blueglasses> how do i configure the project branch in lauchpad? it says the word for my project is too small
[22:45] <blueglasses> but its already there...
[22:45] <blueglasses> its called story
[23:44] <mgz> is launchpad lagging behind on the bzr branch a known issue?
[23:45] <mgz> 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] <poolie> mgz, it might be related to an issue with the branch scanner on the weekend
[23:52] <poolie> mwhudson: what do you think?