| bkerensa | slangasek: do I have to bzr branch MP's everytime just to merge them? | 00:13 |
|---|---|---|
| slangasek | yes | 00:14 |
| bkerensa | 1. bzr branch then bzr merge? | 00:14 |
| bkerensa | why does it add a revision sometimes when I do it | 00:14 |
| bkerensa | instead of just using the contributors commit? | 00:14 |
| slangasek | a merge is its own commit | 00:14 |
| slangasek | and normal practice is that when merging another branch, you create a commit summarizing the whole branch... this ensures, for instance, that a bisect down the main branch gives you consistently-usable results | 00:15 |
| bkerensa | slangasek: is there a wiki that breaks this all down? I am re-writing Ubuntu Doc Team wiki and we might need to add this | 00:16 |
| slangasek | there's the Ubuntu Packaging Guide | 00:16 |
| slangasek | there might be some generic bzr docs, I don't know | 00:16 |
| bkerensa | slangasek: http://bazaar.launchpad.net/~ubuntu-core-doc/ubuntu-docs/saucy/revision/212 | 00:18 |
| bkerensa | was that a clean merge? | 00:18 |
| bkerensa | http://bazaar.launchpad.net/~ubuntu-core-doc/ubuntu-docs/saucy/changes | 00:18 |
| bkerensa | that even | 00:18 |
| bkerensa | I guess it was looks fine to me as far as how the revision showed up | 00:18 |
| slangasek | bkerensa: if you didn't have to resolve any merge conflicts, then yes, it was a clean merge | 00:31 |
| === meetingology` is now known as meetingology | ||
| MarkDude | bkerensa: was 1305 dropped? | 15:46 |
| bkerensa | hmm? | 15:46 |
| MarkDude | error when I load it | 15:46 |
| MarkDude | https://blueprints.launchpad.net/ubuntu/+spec/community-1305-ubuntu- | 15:46 |
| MarkDude | I found it | 15:48 |
| bkerensa | thats not a blueprint | 15:48 |
| MarkDude | I think the email link was formed wrong | 15:48 |
| MarkDude | Im on the pad now | 15:49 |
| MarkDude | http://summit.ubuntu.com/uds-1305/meeting/21740/community-1305-ubuntu-website-planning/ | 15:49 |
| MarkDude | This one | 15:49 |
| MarkDude | :D | 15:49 |
| === blkperl_ is now known as blkperl | ||
| * blkperl is disappointed that there is no mdraid docs in the ubuntu server guide | 23:07 | |
| blkperl | only for the installer section... | 23:08 |
| bkerensa | blkperl: file a bug or do work | 23:08 |
| bkerensa | :) | 23:08 |
| bkerensa | blkperl: bzr branch lp:serverguide | 23:09 |
| bkerensa | blkperl: make changes | 23:09 |
| bkerensa | blkperl: commit and merge propose | 23:09 |
| bkerensa | :) | 23:09 |
| blkperl | bkerensa: I have commits in the server guide, its not very rewarding to contribute though | 23:09 |
| bkerensa | blkperl: pfft | 23:10 |
| blkperl | the last server guide only had a few contributers | 23:10 |
| blkperl | it needs more love | 23:10 |
| bkerensa | blkperl: why is it not rewarding | 23:10 |
| blkperl | bkerensa: thankless job, and theres other sources of docs | 23:10 |
| bkerensa | ;0 | 23:11 |
| blkperl | maybe if more people contributed it would be better and useful but most of the time its only good for basics | 23:12 |
Generated by irclog2html.py 2.7 by Marius Gedminas - find it at mg.pov.lt!