[01:03]  * Fujitsu waits for mthaddon's next response to the lovely discourse in progress in question #21397.
[01:19]  * Nafallo tickles Fujitsu 
[01:19]  * Fujitsu swats Nafallo.
[03:25] <jtt> does anyone know  how i can search launchpad for the pattern  dpkg --configure -a
[03:26] <spiv> jtt: http://www.google.com/search?q=site%3Alaunchpad.net+%22dpkg+--configure+-a%22
[03:26] <jtt> spiv thanks
[03:42] <forsaken> anyone that can help me start submitting my code to launchpad? I created a project, but i'm getting a public key error...
[03:43] <forsaken> i think i submitted my keys...?
[06:52] <emgent> hello someone here?
[07:06] <Fujitsu> emgent: For what do you wish?
[07:08] <emgent> heya Fujitsu, only one questione about my launchpad page (https://edge.launchpad.net/~emgent)
[07:08] <emgent> i'd like know why "answers" icon dont give up
[07:09] <Fujitsu> Have you asked/answered any questions?
[07:09] <emgent> sure
[07:09] <Fujitsu> Ah, I see you have.
[07:09] <emgent> it'snt normal.. :O
[07:10] <Fujitsu> I'm not sure what algorithm is used to work out whether you get one or not; I have asked three questions on the launchpad project, and have the icon...
[07:10] <emgent> uhm
[07:11] <emgent> possible bug'
[07:11] <emgent> s/'/?/
[07:11] <Fujitsu> It's probably based on karma, and you seem to have no answers-karma.
[07:11] <emgent> false
[07:11] <emgent> i have answers-karma
[07:12] <emgent> https://edge.launchpad.net/~emgent/+karma
[07:12] <Fujitsu> I think you should, but https://launchpad.net/~emgent/+karma says you don't.
[07:12] <emgent> uhm
[07:12] <emgent> impossible :°
[07:12] <Fujitsu> It's possible I've caught it in the middle of the recalculation, where rendered values seem to be completely arbitrary, but that's unlikely.
[07:13]  * Fujitsu thinks an LP dev might have a better idea.
[07:13] <emgent> uhm ok, i will wait launchpad dev :P
[07:14] <emgent> thanks Fujitsu 
[08:07] <paulvg> hello ./ i uploaded a package to ppa but it doesn't show up even if i select "All states", how come?
[08:09] <Fujitsu> paulvg: Did you get an Accepted email?
[08:10] <paulvg> ooh, lemme check...
[08:11] <paulvg> oh ic, it landed in the wrong inbox
[08:12] <paulvg> "Rejected:
[08:12] <paulvg> Signer has no upload rights at all to this distribution.
[08:12] <paulvg> Not permitted to upload to the RELEASE pocket in a series in the 'CURRENT' state."
[08:12] <Fujitsu> Ah.
[08:12] <Fujitsu> You tried to upload to Ubuntu, not your PPA.
[08:12] <paulvg> i did?
[08:12] <paulvg> lmao
[08:28] <paulvg> oh noes
[08:28] <paulvg> it rejected again :'(
[08:28] <paulvg> "Rejected:
[08:28] <paulvg> MD5 sum of uploaded file does not match existing file in archive
[08:28] <paulvg> Files specified in DSC are broken or missing, skipping package unpack verification."
[08:28] <Fujitsu> Aha.
[08:28] <Fujitsu> What package?
[08:29] <Fujitsu> What version, also?
[08:29] <paulvg> i uploaded freeswitch from svn, after changing the changelog and control
[08:29] <paulvg> svn snapshot
[08:29] <paulvg> 7080
[08:29] <Fujitsu> Different snapshot to last time?
[08:29] <paulvg> yup
[08:29] <Fujitsu> What was the exact version number you used?
[08:30] <paulvg> freeswitch_1.0~beta3-1ubuntu2
[08:30] <Fujitsu> Right, that's wrong.
[08:30] <paulvg> why
[08:30] <Fujitsu> You changed the .orig.tar.gz, did you not?
[08:30] <paulvg> no, i let debuild make it
[08:30] <Fujitsu> How did you upgrade to the SVN snapshot?
[08:31] <paulvg> the .orig directory is the actual svn snapshot
[08:31] <paulvg> svn update
[08:31] <paulvg> the other directory has my changes
[08:31] <Fujitsu> So the previous one wasn't in fact 1.0b3, but a SVN snapshot?
[08:32] <paulvg> well ofcourse, beta3 doesn't mean much afaik
[08:32] <Fujitsu> Anyway, you've apparently modified the .orig.tar.gz.
[08:32] <Fujitsu> If you do that, you must change the version number before the -.
[08:32] <paulvg> debuild made the tar
[08:32] <Fujitsu> That is, you probably want 1.0~beta3+svn7080-1ubuntu2.
[08:33] <Fujitsu> Er, -0ubuntu1, sorry.
[08:33] <Fujitsu> debuild won't modify the .orig.tar.gz, to the best of my knowledge.
[08:33] <paulvg> ok, strange though, things did workTM last time
[08:33] <Fujitsu> It worked last time because there was nothing to conflict with.
[08:34] <Fujitsu> This time, it sees the old freeswitch_1.0~beta3.orig.tar.gz, and screams when the new one is different, but with the same name.
[08:34] <paulvg> oic
[09:29] <paulvg> yay, it worked!
[09:29] <paulvg> thanks for the help
[09:30] <Fujitsu> paulvg: No problem. :)
[09:31] <paulvg> the email said accepted, it still doesn't show up on lp though but i guess it's allright
[09:32] <Fujitsu> It is on LP.
[09:32] <paulvg> where
[09:32] <Fujitsu> I saw it several minutes before you mentioned it.
[09:32] <Fujitsu> Oh, you're looking at +builds?
[09:32] <paulvg> https://edge.launchpad.net/~paulvg/+archive/+builds?build_text=&build_state=all
[09:33] <Fujitsu> Right, the builds won't be created for probably about another 30 minutes.
[09:33] <Fujitsu> If you take out /+builds..., you'll see it.
[09:33] <paulvg> oic, status "Pending"
[09:34] <Fujitsu> Correct.
[09:34] <paulvg> could take a while on a caturday i guess :p
[09:34] <Fujitsu> It will be published in 6 minutes.
[09:34] <paulvg> ?
[09:34] <Fujitsu> It will move from Pending to Published at XX:40.
[09:35] <paulvg> ok, kewl
[09:35] <paulvg> actually building it usually takes much longer though
[09:36] <Fujitsu> The builds will take some time to appear (this should be fixed in Launchpad 1.2.1, I believe), but should start building fairly quickly.
[09:36] <paulvg> that's great :)
[09:36] <Fujitsu> Once they've finished building, they should be published at the next publisher run, which is (IIRC) every 20 minutes.
[09:38] <paulvg> does there happen to be a way to disable lpia? it'll probably fail each time
[09:39] <Fujitsu> I don't think that's possible in a PPA. Normally in Ubuntu we'd tell it not to build on lpia in a file called Packages-arch-specific, but not in PPA.
[09:39] <Fujitsu> Why does it fail on lpia?
[09:40] <Fujitsu> It shouldn't take much to make it work.
[09:41] <paulvg> yeah ok let's leave it then, last time it was a "file not found" error :p strange though
[09:42] <Fujitsu> lpia is almost identical to i386.
[09:42] <Fujitsu> The instruction set is the same.
[09:42] <paulvg> then it should compile with -D__VIA_HACK__ which is default iirc
[09:48] <paulvg> well actually it might compile without but it may crash when using mod_portaudio
[09:50] <Fujitsu> Why would it do that?
[09:50] <paulvg> ic it uses #if defined( __i386__ ), if lpia doesn't define that this should always be safe, but it's just a minor issue anyway :p
[09:52] <paulvg> because of 3 sse2 instructions... but anyway i hope the build works, i'll worry about lpia later if it does
[09:53] <Fujitsu> Ah.
[10:01] <emgent> some launchpad devel here?
[10:07] <Fujitsu> emgent: It's a weekend, so you might not be able to find anyone.
[10:07] <emgent> heheh :)
[10:18] <paulvg> lp seems unsure when the build started: https://edge.launchpad.net/~paulvg/+archive/+build/484012
[10:19] <paulvg> or what builder it's on
[10:21] <Fujitsu> paulvg: The fields are duplicated when it's building - I reported that bug a few weeks ago. You'll find the real fields at the bottom.
[10:21] <Fujitsu> Note that the build has just failed, so the duplicated fields are no longer present.
[10:22] <Fujitsu> Bug #177824
[10:22] <ubotu> Launchpad bug 177824 in soyuz "Build page for currently building builds has duplicate fields" [Medium,In progress] https://launchpad.net/bugs/177824 - Assigned to Celso Providelo (cprov)
[10:32] <paulvg> can i patch this without rebuilding the .orig?
[10:33] <Fujitsu> As long as you don't modify the .orig.tar.gz, yes.
[10:33] <paulvg> but need to +1 the version number, right?
[10:34] <paulvg> +i
[10:34] <Fujitsu> Just make it ubuntu2, right.
[10:38] <paulvg> hm, i think i'm doing it wrong... the directory is called freeswitch-1.0~beta3+svn7090 not freeswitch-1.0~beta3+svn7090-0ubuntu2
[10:38] <Fujitsu> paulvg: No, that's right.
[10:38] <Fujitsu> The dash seperates the upstream and Debian (or Ubuntu, in this case) versions.
[10:38] <paulvg> well ok then -_-'
[10:46] <paulvg> is this anything to worry about? "bad-distribution-in-changes-file gutsy"
[10:47] <Hobbsee> no
[10:47] <paulvg> and the tonnes of W: freeswitch source: source-contains-svn-control-dir
[10:48] <Kmos> paulvg: that yes.. remove all .svn
[10:49] <Hobbsee> paulvg: W means warning.  E means error.
[10:49] <Hobbsee> paulvg: still, some warnings are important
[10:49] <paulvg> i knew that -_-'
[11:05] <paulvg> kmos: i'll look into getting rid of .svn later, i hope the build works this time
[11:06] <paulvg> gotta run, thanks for all the help!
[11:07] <paulvg> nice day y'all
[11:07] <LucidFox> I have several .po files stuck in the translation import queue, the oldest one since October. Could someone look into this?
[11:08] <Hobbsee> LucidFox: it's a saturday
[11:10] <LucidFox> Heh. What would be a better day to ask?
[11:10] <Fujitsu> Not a weekend, where the Canonical employees won't be here.
[11:10] <Hobbsee> LucidFox: UK working week
[11:15] <ubotu> New bug: #180523 in launchpad "canceling duplicates is very unintuitive" [Undecided,New] https://launchpad.net/bugs/180523
[11:19] <Fujitsu> Dupe.
[11:19]  * Fujitsu finds it.
[11:56] <jel> Hi guys :)   Reading the PPA stuff, it seems to say that only x86/amd64 are supported.  Is there a way to make arch-independent stuff (packages for python code)?
[11:59] <Kmos> jel: lpia is also supported
[12:00] <Hobbsee> Fujitsu: is it arch:  all or arch: any? in debian/control for that?
[12:00]  * Hobbsee can never remember
[12:00] <Kmos> jel: just put "any" is Architecture: in debian/control.
[12:00] <Kmos> *as
[12:06] <Fujitsu> jel: Architecture independent stuff is architecture `all'
[12:06] <Fujitsu> Not `any'.
[12:06] <Fujitsu> jel: For an example, check pretty much any python-* package.
[12:16] <jel> OK, thanks :)
[12:23] <IntuitiveNipple> Could anyone solve some confusion I have over a PPA upload that shows as Published, but it is only there as source files (no binaries) and there's no build reports?
[12:24] <Hobbsee> IntuitiveNipple: the build queue is probably long
[12:24] <Hobbsee> or ppas are borken
[12:25] <IntuitiveNipple> Ahh... so, having got the Accepted email and showing as Published doesn't imply something was forgotten then?
[12:25] <Hobbsee> IntuitiveNipple: how long ago were they uploaded?
[12:25] <Hobbsee> IntuitiveNipple: what was it?
[12:25] <Hobbsee> and what's your LP id?
[12:26] <IntuitiveNipple> about an hour - I've done a new awstats package for 6.7 which doesn't 'have' binaries of course (perl scripts)
[12:26] <IntuitiveNipple> https://edge.launchpad.net/%7Eintuitivenipple/+archive
[12:26]  * Fujitsu looks too.
[12:26] <IntuitiveNipple> It builds fine in a pbuilder locally, which is why I've got confused :)
[12:27] <Fujitsu> Ah, it's very fresh.
[12:27] <Fujitsu> Give it half an hour to get builds, then they'll build.
[12:27] <IntuitiveNipple> btw... I've just uploaded a better version 0ubuntu2~ppa1 - forgot to set the proper version 1st time around :)
[12:27] <Fujitsu> Ah.
[12:27] <Fujitsu> So the previous version might have got somewhere.
[12:27] <Hobbsee> it's just built on i386, too
[12:27] <IntuitiveNipple> ok... what got me is there were no logs, and no status saying "waiting to be built" - that "Published" sounds kinda final :)
[12:28] <Fujitsu> Published refers to the sources.
[12:28] <Hobbsee> https://edge.launchpad.net/~intuitivenipple/+archive/+builds?build_text=&build_state=all
[12:28] <Hobbsee> ^ is the binaries
[12:28] <IntuitiveNipple> well darn me! It only did that build right now to embarrass me!
[12:29] <Fujitsu> IntuitiveNipple: The builds should be created within about 40 minutes of your upload. They should start building soon after that.
[12:29] <IntuitiveNipple> Ok... thanks... being the first one I've tried I was sure I'd got it wrong :)
[12:30] <IntuitiveNipple> There ought to be a "pending" state in the build records... save idiots like me getting confused 
[12:31] <Fujitsu> IntuitiveNipple: There is a pending state.
[12:31] <Fujitsu> It is, in fact, called `Pending'.
[12:31] <Fujitsu> The problem is that the build-creating bit of Launchpad can't quite handle the load of all these hundreds of thousands of builds, so takes half an hour to run.
[12:33] <Fujitsu> So the builds don't appear in the first place until a second or two before they start building.
[12:33] <IntuitiveNipple> "pending" ? Hmm, up until that build just now, there was nothing show for 'build_state=all' 
[12:33] <Fujitsu> This should be fixed in Launchpad 1.2.1, due in a couple of weeks.
[12:33] <IntuitiveNipple> ahhh ok... so there's sort of a 'hole' then between upload/publish and build 
[12:33] <Fujitsu> Yes.
[12:34] <Fujitsu> A separate process looks for new uploads, and creates the build records.
[12:34] <IntuitiveNipple> It's pretty cool as it is; I think the problem is the guides don't show a step-by-step expectation of what to see, they leave a lot assumption in this regard. I was reading all the PPA guides and meeting logs for clues 
[12:35] <Fujitsu> Well, it will hopefully make more sense in a couple of weeks. I've seen this question a lot lately.
[12:35] <IntuitiveNipple> I'm glad I'm not alone :)
[12:36] <IntuitiveNipple> I'd have been ok if the guide showed an actual session with what to expect for a successful process start to end
[12:36] <iKs> Hello.
[12:37] <Fujitsu> Hello iKs.
[12:37] <iKs> I'm trying to commit to my branch in Launchpad
[12:37] <iKs> and I basically get told that there is a lock, put by me, that prevents me from doing that
[12:37] <iKs> Unable to obtain lock lp--1220469780:///lock
[12:37] <iKs> locked 17 hours, 38 minutes ago
[12:37] <iKs> Will continue to try until 12:39:50
[12:38] <iKs> (and "held by [myemailadress] on [mycomputer]" also)
[12:38] <Fujitsu> Bleeergh.
[12:38] <Fujitsu> Oh.
[12:38] <iKs> How do I tell bazaar to take that lock out ? :D
[12:38] <Fujitsu> So it's not the LP-lock-holding bug.
[12:38] <Fujitsu> bzr break-lock
[12:38] <iKs> ok thanks
[12:38] <iKs> no I aborted a push I think
[12:38] <Fujitsu> OK. You probably want to bzr push --overwrite, then.
[12:39] <iKs> Why ?
[12:39] <Fujitsu> I'm not sure how well it will recover from a partial initial push.
[12:39] <Fujitsu> Or was it not an initial push?
[12:39] <iKs> it was an initial push :)
[12:40] <iKs> but since I'm in Iran right now, tunneling through a serv er in France :D
[12:40] <iKs> It's a bit slow ^^
[12:40] <iKs> i'll do
[12:40] <iKs> that*
[12:40] <Fujitsu> Ah yes, it can get slow.
[12:40] <iKs> Thanks a lot anyways
[12:40] <Fujitsu> No problem - I hope it ends up working for you.
[12:41] <IntuitiveNipple> Somethin else I've just noticed, whilst I'm at it! The package is an _all.deb but none of the report info makes that clear ( the full .deb isn't shown that I can find) and the build entry has specifically inserted 'i386' in places to make it confusing. In the build-log itself it does say " ../awstats_6.7+dfsg-0ubuntu1_all.deb" but thats all I can find.
[12:41] <iKs> Which protocol should I use on LP, bzr+ssh or sftp ? (in your opinion)
[12:42] <Fujitsu> bzr+ssh, if at all possible.
[12:42] <Hobbsee> IntuitiveNipple: i386 builds arch: all packages
[12:42] <Fujitsu> IntuitiveNipple: arch all builds are identical to i386 builds, except that the .deb is named differently and is published on all archs.
[12:42] <iKs> Fujitsu: why ? In which way is it better ?
[12:42] <Hobbsee> iKs: faster
[12:42] <iKs> Faster maybe ?
[12:42] <iKs> OK :)
[12:42] <iKs> Thanks a lot.
[12:42] <Fujitsu> iKs: It uses bzr on the other end too, and is much faster.
[12:43] <IntuitiveNipple> Is it? Ahhh thanks. Another little thing needs documenting then :)
[12:44] <Fujitsu> Bug #40096
[12:44] <ubotu> Launchpad bug 40096 in soyuz "do not show architecture 'all' builds as i386" [Medium,Confirmed] https://launchpad.net/bugs/40096 - Assigned to Diogo Matsubara (matsubara)
[12:45] <IntuitiveNipple> :)
[12:45] <Fujitsu> It was called `simple' more than 18 months ago, so don't count on it being fixed soon. Documentation is probably a good idea.
[12:46] <Fujitsu> Hobbsee: Do we know how the extended PPA FAQ is coming along?
[12:46] <IntuitiveNipple> yeah... just a note in the quickstart guide would help, especially as the people coming to PPA are more likely to be packaging novices
[12:46] <IntuitiveNipple> There's a few fixme's and blanks in the draft, when I looked earlier
[12:55] <Hobbsee> Fujitsu: no, but it's pending on people who are actually paid to do it
[12:55] <Hobbsee> and that it's certainly planned to be done at some point
[12:57] <Hobbsee> the sooner the better, obviously, but i don't overly want to write it myself, in current state
[13:10] <ubotu> New bug: #180538 in malone "Email interface doesn't allow escaping quotes in summary line" [Undecided,New] https://launchpad.net/bugs/180538
[13:50] <ubotu> New bug: #180554 in launchpad "karma dont work fine, answers karma dont work. Answers icon in "most active in" dont work too" [Undecided,New] https://launchpad.net/bugs/180554
[14:35] <emgent> heya fabbione :)
[14:35] <fabbione> hi
[14:59] <mpt> Gooooooooooooooooooooooooood afternoon Launchpadders!
[15:00] <geser> Hi mpt
[16:36] <ubotu> New bug: #180591 in launchpad "Can't edit/update the details that login.launchpad.net sends (dup-of: 177401)" [Undecided,New] https://launchpad.net/bugs/180591
[16:46] <ubotu> New bug: #180593 in launchpad "Add option to disable @ubuntu.com email forwarding" [Undecided,New] https://launchpad.net/bugs/180593
[17:25] <mpt> Egads
[18:58] <shiyee> when pushing to a LP bzr branch, i get the error "bzr: ERROR: Can't rename /srv/sm-ng/push-branches/00/00/14/e2/.bzr/repository/lock/auimcuu0ta.tmp to /srv/sm-ng/push-branches/00/00/14/e2/.bzr/repository/lock/held: /srv/sm-ng/push-branches/00/00/14/e2/.bzr/repository/lock/held already exists". I think a previous push was interrupted, will this fix itself, or can anyone help me?
[19:00] <jelmer> shiyee: you may be able to run "bzr break-lock"
[19:01] <shiyee> jelmer: nope, same error
[19:01] <shiyee> oh wait...
[19:02] <shiyee> jelmer: thx alot, that did the trick :-)
[20:06] <mtaylor> statik: someone should write a mylyn plugin for launchpad
[20:21] <_flx> hi
[20:21] <_flx> I would need help on the Bazaar system
[20:21] <_flx> I registered a main branch on Launchpad
[20:22] <_flx> aud made myself a dev branch
[20:22] <_flx> I made some changes in the dev branch
[20:22] <_flx> and clicked the "Propose for merging" in Launchpad so these changes could be merged into my trunk
[20:22] <_flx> but I don't quite understand how to merge those together
[20:23] <LarstiQ> _flx: heh, you're probably the one who would be doing the merging :)
[20:24] <LarstiQ> _flx: cd main.branch; bzr merge url-to-dev-branch; *review changes*; bzr commit
[20:25] <_flx> LarstiQ, Oh.. I see.. I don't have the "main branch" on my system
[20:25] <LarstiQ> _flx: you do have the dev branch though?
[20:25] <_flx> LarstiQ, Yes
[20:27] <_flx> I "kind of" transformed my trunk branch into a dev branch
[20:27] <_flx> but if I "bzr info"
[20:27] <LarstiQ> _flx: I guess this turns into a question of workflow. If your main branch does not have any new revisions you could just push your dev branch to it
[20:28] <LarstiQ> _flx: but if you want to more clearly mark that this work was done in a seperate branch, then merging would be the way to go
[20:29] <_flx> LarstiQ, Yes this is what I previously made (bzr push into the trunk), But since I'm trying to understand the Bazaar way of doing things and since I want to learn the "right way". If I understand, the trunk is not a dev branch itself. It is more a "merge location" for task-branches to be merged to
[20:30] <LarstiQ> _flx: that is indeed one way of working
[20:31] <_flx> LarstiQ, sounds good to me, altough I don't quite see the "P2P" aspect of it
[20:33] <LarstiQ> _flx: http://bazaar-vcs.org/Workflows may help
[20:34] <_flx> LarstiQ, What I evoked previously is, I think, the Decentralized with shared mainline
[20:35] <_flx> The thing I don't understand is why SVN couldn't do it. As far as I can see, it can also create branches and merge them together/into the mainline
[20:37] <LarstiQ> _flx: it can, but not decentralized, it needs to be done in the central repository, so you need connectivity to it at all times. That makes branching much more expensive so the incentive to do it isn't there as much.
[20:38] <LarstiQ> _flx: and the merging support is way more painful, although the svn people are working on that
[20:39] <_flx> LarstiQ, So basically what you are saying is that I can take a snapshot from lets say DevA, branch it, make some changes than publish this into the mainline when connectivity allows it ?
[20:39] <LarstiQ> _flx: yes
[20:40] <LarstiQ> _flx: or decide it's all wrong and never publish it, that's a great freedom of being decentralized
[20:40] <_flx> LarstiQ, Sounds interresting. Another question, what is the difference between the "bzr init-repo URL" and "bzr branch URL" ?
[20:41] <_flx> LarstiQ, I see. Launchpad is here to help publish/host branches.
[20:42] <LarstiQ> _flx: the first will create a repository at URL which can be used by multiple branches to store their revisions. The second will make a branch locally, and copying the information from the branch at URL
[20:42] <LarstiQ> _flx: exactly
[20:42] <LarstiQ> _flx: (well, and bugtracking/translations/blueprints etc)
[20:43] <_flx> LarstiQ, so the first command would make my "disk" to be avaiable to all for branching/commiting ?
[20:43] <LarstiQ> _flx: there is one notable workflow missing from that wiki page, and that's completely decentralized mesh merging. The drawback of that is that it's complete anarchy.
[20:43] <LarstiQ> _flx: not exactly
[20:44] <LarstiQ> _flx: you could just branch or bzr init to get a branch you can work and commit in
[20:45] <LarstiQ> _flx: but if you do that under an area you have created a repository, the branches will share it as a storage for revisions, which takes less diskspace and can often be faster
[20:46] <_flx> uhm ok
[20:46] <_flx> Sounds less "egoist"
[20:47] <LarstiQ> _flx: a typical way to use it would be: bzr init-repo $HOME/src/bzr; cd $HOME/src/bzr; bzr branch http://bazaar-vcs.org/bzr/bzr.dev (this will create a branch at $HOME/src/bzr/bzr.dev); bzr branch bzr.dev bzr.lq
[20:48] <LarstiQ> _flx: you then have two branches, a local mirror of bzr.dev, and a personal bzr.lq branch to work in. But the storage cost is only a few kilobytes more than if you had only the bzr.dev mirror
[20:49] <_flx> ok I just did that. Let me do some test, I might have some other questions
[20:50] <LarstiQ> sure. 
[20:50] <LarstiQ> _flx: if they're all bzr related, we can also move it to #bzr
[20:50] <_flx> It will be Launchpad related in few minutes ;)
[20:52] <_flx> Ok I made a download of the trunk and a branch from it
[20:52] <_flx> I made a change into my branch (renamed a file)
[20:52] <_flx> if I "bzr commit", the change will be local only isn't it ? 
[20:55] <LarstiQ> yes
[20:55] <ubotu> New bug: #180644 in launchpad-bazaar "Branch status menu has long clumsy caption" [Undecided,New] https://launchpad.net/bugs/180644
[20:56] <_flx> LarstiQ, I didn't made a "bzr push" and tried to merge the branch into the trunk but it says it have nothing to do
[20:57] <_flx> LarstiQ, What is the error I made ?
[20:58] <LarstiQ> _flx: if there is nothing to do, all the revisions in the branch you are trying to merge from are usually already contained in the branch you're merging into
[20:58] <LarstiQ> _flx: from the trunk, what does 'bzr missing url-to-dev' report?
[20:59] <_flx> LarstiQ, it reports that I am missing 1 revision
[21:00] <_flx> LarstiQ, now the merge works... I don't understand, I didn't do anything 
[21:00] <LarstiQ> _flx: what exact command did you give before when it reported nothing to do?
[21:00] <_flx> LarstiQ, Oh, I forgot a dot... I wrote ./branches instead of ../branches
[21:02] <LarstiQ> _flx: ah :)
[21:02] <_flx> LarstiQ, when trying to push to Launchpad, it says that there is no new revision to push
[21:03] <LarstiQ> _flx: after merging, there is no new revision created. You will have to commit first before that happens.
[21:03] <LarstiQ> _flx: it's good practice to check the merge went ok before doing so, with the help of bzr status and bzr diff for example
[21:05] <_flx> LarstiQ, ok, it worked. Another thing is when trying to push my dev branch to Launchpad, it told me that my branches had diverged
[21:06] <_flx> LarstiQ, also, Launchpad is still showing the "Branches proposed to be merged into this one" line
[21:08] <LarstiQ> _flx: when branches each have new revisions that are not in the other branch, they have diverged, use bzr missing to find out what happened
[21:12] <_flx> LarstiQ, it complains that the branch has one missing rev and the trunk has one extra rev but its the same rev...
[21:12] <LarstiQ> _flx: absolutely the same?
[21:13] <_flx> LarstiQ, yes
[21:13] <LarstiQ> _flx: ie, same revision ids? (bzr missing --show-ids)
[21:14] <_flx> yes
[21:15] <LarstiQ> _flx: could you pastebin that output?
[21:15] <_flx> LarstiQ, yes, sec
[21:16] <_flx> LarstiQ, http://pastebin.com/d3c6f2c00
[21:19] <LarstiQ> _flx: ah, I didn't realise you were running it from both sides. You only have to run missing once and it will tell you if/what you have extra or are missing. From the other sides just swap the two categories.
[21:19] <LarstiQ> _flx: so this is entirely fine locally
[21:19] <_flx> LarstiQ, Okay so I guess it is normal
[21:20] <LarstiQ> _flx: if you would 'bzr push ../../trunk' locally from experimental-0.1, it would update the trunk with the new revision
[21:20] <LarstiQ> _flx: but which branch was it that complained about divergence?
[21:20] <LarstiQ> or, which url
[21:20] <LarstiQ> since branches are identified by url
[21:20] <_flx> experimental-1.0 locally vs experimental-1.0 Launchpad
[21:21] <LarstiQ> _flx: ok, so could you run missing between those two?
[21:23] <_flx> http://pastebin.com/d2938db90
[21:25] <LarstiQ> _flx: ok, so there it's genuinely diverged.
[21:25] <_flx> LarstiQ, What can I do to fix this ?
[21:26] <LarstiQ> _flx: if you want to have both revisions, merge the launchpad version into your local one, fix, commit, push.
[21:26] <LarstiQ> _flx: if you don't care about the launchpad one, bzr push --overwrite
[21:26] <_flx> good
[21:27] <_flx> LarstiQ, it worked
[21:27] <_flx> LarstiQ, Now in Launchpad, how can I get rid of the "This branch is proposed for merging into"
[21:28] <LarstiQ> _flx: now that is actually something I'm not familiar with, give me a minute to read up on it
[21:37] <_flx> LarstiQ, I found a way to just delete the proposal. Thx for all your advices, you were very helpful
[21:37] <LarstiQ> _flx: np, pleased to be of help