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