| dsmythies | There is supposed to be a doc team meeting in #ubuntu-meeting-2 in about 20 minutes. However, #ubuntu-meeting-2 seems to be broken. Can anyone confirm or deny it is broken? (no bots are present and such) | 17:12 |
|---|---|---|
| pleia2 | it looks fine to me | 17:13 |
| pleia2 | dsmythies: you don't seem to be joined there... | 17:13 |
| dsmythies | pleia2: Thanks. I should learn to type. I did the same mistake 5 times.... | 17:14 |
| pleia2 | aha :) | 17:14 |
| dsmythies | pleia2: O.K. that's better. Now I better print your "Meetingology bot crash course" notes. | 17:16 |
| pleia2 | \o/ | 17:16 |
| imnichol | dsmythies, Sorry about that, had to go shovel my sidewalk | 18:41 |
| * pleia2 was on a work conference call :\ | 18:44 | |
| dsmythies | imnichol Oh, ha ha. I live in Canada on the west coast. My worry is that it is so warm my apple trees might come out of dorminate stage too early, leading to crop failure. | 18:46 |
| imnichol | dsmythies, I understand that. We've consistently had a bad few years with late frosts here in GMT-6 | 18:46 |
| imnichol | Lots of orchards lost their harvests | 18:47 |
| dsmythies | In the meeting I was just wanting to know if you had anything to bring up or how we might otherwsie try to help. | 18:47 |
| imnichol | Actually, there is a question I've had | 18:48 |
| dsmythies | Go ahead | 18:48 |
| imnichol | When I'm working on fixing a bug in the server guide, I branch from the project, make changes, and then push the changes | 18:49 |
| imnichol | But when I want to fix a second bug, I can't figure out how to keep the modifications I made to fix the first bug from being part of the merge proposal for the second bug | 18:49 |
| imnichol | So I end up using rm to delete the folder and then branch it again | 18:50 |
| imnichol | Is there a way to not have to pull the project down a 2nd time? | 18:50 |
| imnichol | And I'm sorry, pretty sure 100% of the terms that I used there were wrong | 18:50 |
| dsmythies | imnichol: That is a really good question. I find bzr somewhat difficult to use and mysterious. I also get confused because I use git more often than bzr, although I have troubles with git also... | 18:53 |
| imnichol | Ironic that my problem here seems to be a documentation issue..... | 18:53 |
| dsmythies | anyway, to answer your question... | 18:54 |
| dsmythies | I will sometimes keep a local "master" copy of the branch and then copy the entire thing to make working copies. You can also checkout the original bzr branch number and then continue with that. I'm actually hoping someone else might chime in on this. | 18:57 |
| imnichol | I need to find a bzr cheatsheet that I can put up next to my desk | 18:58 |
| dsmythies | me also, but I do find the man pages useful. | 18:58 |
| imnichol | Ahah http://doc.bazaar.canonical.com/latest/en/_static/en/bzr-en-quick-reference.pdf | 18:58 |
| dsmythies | imnichol: I am out of time for now. I'll do some experiments with "bzr revno" and get back to you. It might not be today. | 19:05 |
| imnichol | No prob, take your time :) | 19:06 |
| imnichol | Thanks for your help | 19:06 |
| pmatulis | imnichol: the simplest way is to just make a new branch for the second proposal. otherwise you will need to just make the 2nd change, push again, and in the merge proposal you will be fixing two things. fine if those 2 things are not disparate. can be frowned upon if they are, but still acceptable | 19:10 |
| imnichol | pmatulis, are you talking about deleting the folder where the branch is and then branching it again? | 19:13 |
| pmatulis | imnichol: no need to delete. just create another one | 19:15 |
| pmatulis | imnichol: it's good to keep a record of things on your filesystem | 19:15 |
| imnichol | pmatulis, can I branch over it? | 19:19 |
| imnichol | I like to keep my ~ clean | 19:19 |
| pmatulis | imnichol: nope | 19:23 |
| pmatulis | imnichol: you should have a top level directory. put branches/contributions under it | 19:23 |
| pmatulis | ~/serverguide/14.04/{branch_blah,branch_foo,branch_bar} | 19:25 |
Generated by irclog2html.py 2.7 by Marius Gedminas - find it at mg.pov.lt!