| === tim__sharitt is now known as tim_sharitt | ||
| Rocket2DMn | mdke, did you get my message the other day about branches? | 19:13 |
|---|---|---|
| mdke | Rocket2DMn: I don't know the answer, I'm afraid - the Launchpad team should know though | 19:32 |
| Rocket2DMn | ok, thanks | 19:32 |
| Rocket2DMn | does it seem to you that the branch goes away though? | 19:32 |
| mdke | Rocket2DMn: the branch isn't listed under "ACtive Branches", but you can see it if you choose branches with "Any status" | 19:39 |
| Rocket2DMn | interesting, I'll check later to see if I'm able to still use it, and if it will re-appear as active | 19:40 |
| mdke | I suppose it should be active again if you push to it | 19:40 |
| mdke | now that it has been merged after your merge proposal, it is marked as not active anymore | 19:40 |
| mdke | that makes sense, in a way | 19:41 |
| Rocket2DMn | makes sense to me :) | 19:41 |
| Rocket2DMn | I'm working on a wiki page, so I'll test it out later | 19:41 |
| Rocket2DMn | thanks for looking into that | 19:41 |
| mdke | np | 19:41 |
| Rocket2DMn | mdke, the changes i have in my branch - have they actually been merged with ubuntu-doc now? so if i change my branch, the work isnt lost? | 20:13 |
| Rocket2DMn | i would like to just sync that branch with ubuntu-doc again | 20:13 |
| mdke | Rocket2DMn: yes, they should have been merged, although I think it was only one bug dealt with in the merge proposal, no? | 21:24 |
| mdke | Rocket2DMn: anyway, if you sync your branch with ubuntu-doc, bzr should tell you any differences that exist (bzr status) | 21:24 |
| Rocket2DMn | yes, it was only one bug | 21:25 |
| mdke | ok | 21:25 |
| Rocket2DMn | i did a bzr bind to ubuntu-doc and i can see a diff | 21:26 |
| Rocket2DMn | if i update, i will have what is in ubuntu-doc | 21:26 |
| Rocket2DMn | I assume if I do that, then bind back to my branch and push, my branch will be the same as ubuntu-doc | 21:26 |
| mdke | I don't think you should use bind if you aren't able to commit to the ubuntu-doc branch | 21:27 |
| Rocket2DMn | oh, is there a better way? | 21:28 |
| mdke | bind implies that any changes made to your local branch will be synched with the online one, and vice versa | 21:28 |
| mdke | if you're not able to push to the online one, it doesn't work, I don't think | 21:29 |
| Rocket2DMn | yeah, i was just binding to ubuntu-doc, downloading the changes, then binding back to my branch | 21:29 |
| Rocket2DMn | yeah i made that mistake, i twouldnt let me push | 21:29 |
| Rocket2DMn | is there a better way to get the updates in ubuntu-doc without binding to it? | 21:29 |
| mdke | you can just do "bzr pull lp:ubuntu-doc" | 21:29 |
| mdke | or bzr merge | 21:30 |
| Rocket2DMn | hmm i got a bzr error on pull | 21:31 |
| mdke | what was it? | 21:31 |
| Rocket2DMn | something very long | 21:31 |
| mdke | go on then | 21:31 |
| Rocket2DMn | its something with the remote server, hold up | 21:32 |
| Rocket2DMn | http://paste.ubuntu.com/169051/ | 21:33 |
| mdke | crickey | 21:34 |
| mdke | you'll have to break the lock | 21:34 |
| Rocket2DMn | i know, it wont let me | 21:35 |
| mdke | try bzr break-lock lp-139944964118224 | 21:35 |
| mdke | twice | 21:36 |
| Rocket2DMn | ok i think i got the lock, let me try to pull again | 21:36 |
| mdke | you need to break it twice | 21:36 |
| Rocket2DMn | ok, i did | 21:37 |
| Rocket2DMn | why twice? | 21:37 |
| mdke | dunno, a bug in LP, I think | 21:37 |
| mdke | unless it's fixed | 21:38 |
| Rocket2DMn | ok, its pulling now | 21:38 |
| Rocket2DMn | dang, i got the same error | 21:38 |
| mdke | I think you have run into a bzr error maybe | 21:39 |
| Rocket2DMn | hehe, a bizarre error | 21:39 |
| mdke | hah | 21:39 |
| Rocket2DMn | ok, well lets try merge instead | 21:40 |
| Rocket2DMn | how do I merge from ubunt-doc if im bound to my own branch? | 21:40 |
| mdke | it should work fine | 21:40 |
| Rocket2DMn | just "bzr merge lp:ubuntu-doc"? | 21:40 |
| mdke | yup | 21:40 |
| Rocket2DMn | hm, says my working tree as uncommitted changes | 21:41 |
| Rocket2DMn | let me try to commit | 21:41 |
| Rocket2DMn | oh, i guess b/c of stuff i've already done, I'm up to dat enow | 21:42 |
| mdke | cool | 21:44 |
| Rocket2DMn | ok mdke , now it shows back on the code page on LP, shows the bug and merge proposal icon | 21:44 |
| mdke | ok | 21:45 |
| mdke | that's not a great commit message ;) | 21:45 |
| mdke | http://bazaar.launchpad.net/~rocket2dmn/ubuntu-doc/my-ubuntu-doc/revision/300 | 21:46 |
| Rocket2DMn | lol sorry | 21:46 |
| mdke | are those your changes or are they stephanie's? | 21:47 |
| Rocket2DMn | not mine | 21:47 |
| mdke | hmm | 21:47 |
| Rocket2DMn | what i really want is to just reset the branch so that it has no history | 21:48 |
| Rocket2DMn | without having to recreate it and upload all the docs again | 21:48 |
| mdke | if I were you, I would just track the ubuntu-doc branch locally without pushing your changes to Launchpad | 21:49 |
| Rocket2DMn | as far as just making patches goes, youre right. The point of doing this was as much an exercise in learning bzr as making doc changes | 21:50 |
| * mdke nods | 21:50 | |
| mdke | I think the way that the bzr/LP workflow is intended to operate is that you push a branch to Launchpad which fixes a specific issue | 21:51 |
| Rocket2DMn | I agree, but why do I have to upload all the ubuntu-doc to make a single change with bzr? there must be another way | 21:51 |
| mdke | not currently, I don't think | 21:52 |
| Rocket2DMn | I would think that I should be able to grab a branch from ubuntu-doc without having to upload the entire main branch again, it should be able to mirror itself on LP | 21:52 |
| mdke | there is discussion of automatically creating a bzr branch from a bundle attached to a bug report | 21:52 |
| mdke | https://lists.launchpad.net/launchpad-users/msg05000.html | 21:55 |
| mdke | the other thing you can do to save time is to use a shared repository | 21:56 |
| mdke | that should speed things up a lot | 21:57 |
| mdke | unfortunately, Launchpad doesn't support them | 21:58 |
| mdke | so pushing will always take as long :( | 21:58 |
| Rocket2DMn | hmmm | 21:58 |
| Rocket2DMn | ok, well I guess I'll remove my branch then | 22:00 |
| Rocket2DMn | how can i destroy it? | 22:00 |
| mdke | mark it as abandoned, I guess | 22:01 |
| Rocket2DMn | how do i do that? | 22:03 |
| mdke | ah, you can delete it, if you like | 22:04 |
| mdke | on the main LP page, there is a trashcan by the branch title | 22:04 |
| Rocket2DMn | ok, lets see what happens | 22:05 |
| Rocket2DMn | maybe i should roll back instead | 22:06 |
| Rocket2DMn | so that it doesnt break links | 22:07 |
| mdke | hmm? | 22:07 |
| Rocket2DMn | you should be able to roll back to a revision, right? | 22:07 |
| mdke | yes | 22:07 |
| Rocket2DMn | maybe we can get it so the branch remains, but its not active | 22:07 |
| mdke | you can mark it as abandoned then | 22:08 |
| Rocket2DMn | ah there's how to do that | 22:08 |
| mdke | next to the trashcan, use the edit button | 22:08 |
| Rocket2DMn | there is an option to mark it as Merged | 22:08 |
| Rocket2DMn | i uncommitted the "none" commented push i believe | 22:09 |
| Rocket2DMn | ok, so now its showing the 299 commit version, as it was before | 22:10 |
| Rocket2DMn | i'll mark it as merged again | 22:10 |
| Rocket2DMn | hah! that did the trick! | 22:11 |
| mdke | nice | 22:11 |
| Rocket2DMn | alright, thanks for the help mdke , this has been enlightening | 22:11 |
| mdke | for me too :) | 22:11 |
| Rocket2DMn | off the gym and to get some food, see ya later | 22:12 |
| mdke | have fun | 22:12 |
Generated by irclog2html.py 2.7 by Marius Gedminas - find it at mg.pov.lt!