/srv/irclogs.ubuntu.com/2008/01/05/#launchpad.txt

* Fujitsu waits for mthaddon's next response to the lovely discourse in progress in question #21397.01:03
* Nafallo tickles Fujitsu 01:19
* Fujitsu swats Nafallo.01:19
jttdoes anyone know  how i can search launchpad for the pattern  dpkg --configure -a03:25
spivjtt: http://www.google.com/search?q=site%3Alaunchpad.net+%22dpkg+--configure+-a%2203:26
jttspiv thanks03:26
forsakenanyone that can help me start submitting my code to launchpad? I created a project, but i'm getting a public key error...03:42
forsakeni think i submitted my keys...?03:43
=== bigon is now known as bigon`
emgenthello someone here?06:52
Fujitsuemgent: For what do you wish?07:06
emgentheya Fujitsu, only one questione about my launchpad page (https://edge.launchpad.net/~emgent)07:08
emgenti'd like know why "answers" icon dont give up07:08
FujitsuHave you asked/answered any questions?07:09
emgentsure07:09
FujitsuAh, I see you have.07:09
emgentit'snt normal.. :O07:09
FujitsuI'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
emgentuhm07:10
emgentpossible bug'07:11
emgents/'/?/07:11
FujitsuIt's probably based on karma, and you seem to have no answers-karma.07:11
emgentfalse07:11
emgenti have answers-karma07:11
emgenthttps://edge.launchpad.net/~emgent/+karma07:12
FujitsuI think you should, but https://launchpad.net/~emgent/+karma says you don't.07:12
emgentuhm07:12
emgentimpossible :°07:12
FujitsuIt'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:12
* Fujitsu thinks an LP dev might have a better idea.07:13
emgentuhm ok, i will wait launchpad dev :P07:13
emgentthanks Fujitsu 07:14
paulvghello ./ i uploaded a package to ppa but it doesn't show up even if i select "All states", how come?08:07
Fujitsupaulvg: Did you get an Accepted email?08:09
paulvgooh, lemme check...08:10
paulvgoh ic, it landed in the wrong inbox08:11
paulvg"Rejected:08:12
paulvgSigner has no upload rights at all to this distribution.08:12
paulvgNot permitted to upload to the RELEASE pocket in a series in the 'CURRENT' state."08:12
FujitsuAh.08:12
FujitsuYou tried to upload to Ubuntu, not your PPA.08:12
paulvgi did?08:12
paulvglmao08:12
paulvgoh noes08:28
paulvgit rejected again :'(08:28
paulvg"Rejected:08:28
paulvgMD5 sum of uploaded file does not match existing file in archive08:28
paulvgFiles specified in DSC are broken or missing, skipping package unpack verification."08:28
FujitsuAha.08:28
FujitsuWhat package?08:28
FujitsuWhat version, also?08:29
paulvgi uploaded freeswitch from svn, after changing the changelog and control08:29
paulvgsvn snapshot08:29
paulvg708008:29
FujitsuDifferent snapshot to last time?08:29
paulvgyup08:29
FujitsuWhat was the exact version number you used?08:29
paulvgfreeswitch_1.0~beta3-1ubuntu208:30
FujitsuRight, that's wrong.08:30
paulvgwhy08:30
FujitsuYou changed the .orig.tar.gz, did you not?08:30
paulvgno, i let debuild make it08:30
FujitsuHow did you upgrade to the SVN snapshot?08:30
paulvgthe .orig directory is the actual svn snapshot08:31
paulvgsvn update08:31
paulvgthe other directory has my changes08:31
FujitsuSo the previous one wasn't in fact 1.0b3, but a SVN snapshot?08:31
paulvgwell ofcourse, beta3 doesn't mean much afaik08:32
FujitsuAnyway, you've apparently modified the .orig.tar.gz.08:32
FujitsuIf you do that, you must change the version number before the -.08:32
paulvgdebuild made the tar08:32
FujitsuThat is, you probably want 1.0~beta3+svn7080-1ubuntu2.08:32
FujitsuEr, -0ubuntu1, sorry.08:33
Fujitsudebuild won't modify the .orig.tar.gz, to the best of my knowledge.08:33
paulvgok, strange though, things did workTM last time08:33
FujitsuIt worked last time because there was nothing to conflict with.08:33
FujitsuThis 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
paulvgoic08:34
paulvgyay, it worked!09:29
paulvgthanks for the help09:29
Fujitsupaulvg: No problem. :)09:30
paulvgthe email said accepted, it still doesn't show up on lp though but i guess it's allright09:31
FujitsuIt is on LP.09:32
paulvgwhere09:32
FujitsuI saw it several minutes before you mentioned it.09:32
FujitsuOh, you're looking at +builds?09:32
paulvghttps://edge.launchpad.net/~paulvg/+archive/+builds?build_text=&build_state=all09:32
FujitsuRight, the builds won't be created for probably about another 30 minutes.09:33
FujitsuIf you take out /+builds..., you'll see it.09:33
paulvgoic, status "Pending"09:33
FujitsuCorrect.09:34
paulvgcould take a while on a caturday i guess :p09:34
FujitsuIt will be published in 6 minutes.09:34
paulvg?09:34
FujitsuIt will move from Pending to Published at XX:40.09:34
paulvgok, kewl09:35
paulvgactually building it usually takes much longer though09:35
FujitsuThe 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
paulvgthat's great :)09:36
FujitsuOnce they've finished building, they should be published at the next publisher run, which is (IIRC) every 20 minutes.09:36
paulvgdoes there happen to be a way to disable lpia? it'll probably fail each time09:38
FujitsuI 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
FujitsuWhy does it fail on lpia?09:39
FujitsuIt shouldn't take much to make it work.09:40
paulvgyeah ok let's leave it then, last time it was a "file not found" error :p strange though09:41
Fujitsulpia is almost identical to i386.09:42
FujitsuThe instruction set is the same.09:42
paulvgthen it should compile with -D__VIA_HACK__ which is default iirc09:42
paulvgwell actually it might compile without but it may crash when using mod_portaudio09:48
FujitsuWhy would it do that?09:50
paulvgic it uses #if defined( __i386__ ), if lpia doesn't define that this should always be safe, but it's just a minor issue anyway :p09:50
paulvgbecause of 3 sse2 instructions... but anyway i hope the build works, i'll worry about lpia later if it does09:52
FujitsuAh.09:53
emgentsome launchpad devel here?10:01
Fujitsuemgent: It's a weekend, so you might not be able to find anyone.10:07
emgentheheh :)10:07
paulvglp seems unsure when the build started: https://edge.launchpad.net/~paulvg/+archive/+build/48401210:18
paulvgor what builder it's on10:19
Fujitsupaulvg: 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
FujitsuNote that the build has just failed, so the duplicated fields are no longer present.10:21
FujitsuBug #17782410:22
ubotuLaunchpad 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:22
paulvgcan i patch this without rebuilding the .orig?10:32
FujitsuAs long as you don't modify the .orig.tar.gz, yes.10:33
paulvgbut need to +1 the version number, right?10:33
paulvg+i10:34
FujitsuJust make it ubuntu2, right.10:34
paulvghm, i think i'm doing it wrong... the directory is called freeswitch-1.0~beta3+svn7090 not freeswitch-1.0~beta3+svn7090-0ubuntu210:38
Fujitsupaulvg: No, that's right.10:38
FujitsuThe dash seperates the upstream and Debian (or Ubuntu, in this case) versions.10:38
paulvgwell ok then -_-'10:38
paulvgis this anything to worry about? "bad-distribution-in-changes-file gutsy"10:46
Hobbseeno10:47
paulvgand the tonnes of W: freeswitch source: source-contains-svn-control-dir10:47
Kmospaulvg: that yes.. remove all .svn10:48
Hobbseepaulvg: W means warning.  E means error.10:49
Hobbseepaulvg: still, some warnings are important10:49
paulvgi knew that -_-'10:49
paulvgkmos: i'll look into getting rid of .svn later, i hope the build works this time11:05
paulvggotta run, thanks for all the help!11:06
paulvgnice day y'all11:07
LucidFoxI have several .po files stuck in the translation import queue, the oldest one since October. Could someone look into this?11:07
HobbseeLucidFox: it's a saturday11:08
LucidFoxHeh. What would be a better day to ask?11:10
FujitsuNot a weekend, where the Canonical employees won't be here.11:10
HobbseeLucidFox: UK working week11:10
ubotuNew bug: #180523 in launchpad "canceling duplicates is very unintuitive" [Undecided,New] https://launchpad.net/bugs/18052311:15
FujitsuDupe.11:19
* Fujitsu finds it.11:19
=== \sh_away is now known as \sh
jelHi 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:56
Kmosjel: lpia is also supported11:59
HobbseeFujitsu: is it arch:  all or arch: any? in debian/control for that?12:00
* Hobbsee can never remember12:00
Kmosjel: just put "any" is Architecture: in debian/control.12:00
Kmos*as12:00
Fujitsujel: Architecture independent stuff is architecture `all'12:06
FujitsuNot `any'.12:06
Fujitsujel: For an example, check pretty much any python-* package.12:06
jelOK, thanks :)12:16
IntuitiveNippleCould 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:23
HobbseeIntuitiveNipple: the build queue is probably long12:24
Hobbseeor ppas are borken12:24
IntuitiveNippleAhh... so, having got the Accepted email and showing as Published doesn't imply something was forgotten then?12:25
HobbseeIntuitiveNipple: how long ago were they uploaded?12:25
HobbseeIntuitiveNipple: what was it?12:25
Hobbseeand what's your LP id?12:25
IntuitiveNippleabout an hour - I've done a new awstats package for 6.7 which doesn't 'have' binaries of course (perl scripts)12:26
IntuitiveNipplehttps://edge.launchpad.net/%7Eintuitivenipple/+archive12:26
* Fujitsu looks too.12:26
IntuitiveNippleIt builds fine in a pbuilder locally, which is why I've got confused :)12:26
FujitsuAh, it's very fresh.12:27
FujitsuGive it half an hour to get builds, then they'll build.12:27
IntuitiveNipplebtw... I've just uploaded a better version 0ubuntu2~ppa1 - forgot to set the proper version 1st time around :)12:27
FujitsuAh.12:27
FujitsuSo the previous version might have got somewhere.12:27
Hobbseeit's just built on i386, too12:27
IntuitiveNippleok... what got me is there were no logs, and no status saying "waiting to be built" - that "Published" sounds kinda final :)12:27
FujitsuPublished refers to the sources.12:28
Hobbseehttps://edge.launchpad.net/~intuitivenipple/+archive/+builds?build_text=&build_state=all12:28
Hobbsee^ is the binaries12:28
IntuitiveNipplewell darn me! It only did that build right now to embarrass me!12:28
FujitsuIntuitiveNipple: The builds should be created within about 40 minutes of your upload. They should start building soon after that.12:29
IntuitiveNippleOk... thanks... being the first one I've tried I was sure I'd got it wrong :)12:29
IntuitiveNippleThere ought to be a "pending" state in the build records... save idiots like me getting confused 12:30
FujitsuIntuitiveNipple: There is a pending state.12:31
FujitsuIt is, in fact, called `Pending'.12:31
FujitsuThe 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:31
FujitsuSo 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
FujitsuThis should be fixed in Launchpad 1.2.1, due in a couple of weeks.12:33
IntuitiveNippleahhh ok... so there's sort of a 'hole' then between upload/publish and build 12:33
FujitsuYes.12:33
FujitsuA separate process looks for new uploads, and creates the build records.12:34
IntuitiveNippleIt'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:34
FujitsuWell, it will hopefully make more sense in a couple of weeks. I've seen this question a lot lately.12:35
IntuitiveNippleI'm glad I'm not alone :)12:35
IntuitiveNippleI'd have been ok if the guide showed an actual session with what to expect for a successful process start to end12:36
iKsHello.12:36
FujitsuHello iKs.12:37
iKsI'm trying to commit to my branch in Launchpad12:37
iKsand I basically get told that there is a lock, put by me, that prevents me from doing that12:37
iKsUnable to obtain lock lp--1220469780:///lock12:37
iKslocked 17 hours, 38 minutes ago12:37
iKsWill continue to try until 12:39:5012:37
iKs(and "held by [myemailadress] on [mycomputer]" also)12:38
FujitsuBleeergh.12:38
FujitsuOh.12:38
iKsHow do I tell bazaar to take that lock out ? :D12:38
FujitsuSo it's not the LP-lock-holding bug.12:38
Fujitsubzr break-lock12:38
iKsok thanks12:38
iKsno I aborted a push I think12:38
FujitsuOK. You probably want to bzr push --overwrite, then.12:38
iKsWhy ?12:39
FujitsuI'm not sure how well it will recover from a partial initial push.12:39
FujitsuOr was it not an initial push?12:39
iKsit was an initial push :)12:39
iKsbut since I'm in Iran right now, tunneling through a serv er in France :D12:40
iKsIt's a bit slow ^^12:40
iKsi'll do12:40
iKsthat*12:40
FujitsuAh yes, it can get slow.12:40
iKsThanks a lot anyways12:40
FujitsuNo problem - I hope it ends up working for you.12:40
IntuitiveNippleSomethin 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
iKsWhich protocol should I use on LP, bzr+ssh or sftp ? (in your opinion)12:41
Fujitsubzr+ssh, if at all possible.12:42
HobbseeIntuitiveNipple: i386 builds arch: all packages12:42
FujitsuIntuitiveNipple: arch all builds are identical to i386 builds, except that the .deb is named differently and is published on all archs.12:42
iKsFujitsu: why ? In which way is it better ?12:42
HobbseeiKs: faster12:42
iKsFaster maybe ?12:42
iKsOK :)12:42
iKsThanks a lot.12:42
FujitsuiKs: It uses bzr on the other end too, and is much faster.12:42
IntuitiveNippleIs it? Ahhh thanks. Another little thing needs documenting then :)12:43
FujitsuBug #4009612:44
ubotuLaunchpad 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:44
IntuitiveNipple:)12:45
FujitsuIt was called `simple' more than 18 months ago, so don't count on it being fixed soon. Documentation is probably a good idea.12:45
FujitsuHobbsee: Do we know how the extended PPA FAQ is coming along?12:46
IntuitiveNippleyeah... just a note in the quickstart guide would help, especially as the people coming to PPA are more likely to be packaging novices12:46
IntuitiveNippleThere's a few fixme's and blanks in the draft, when I looked earlier12:46
HobbseeFujitsu: no, but it's pending on people who are actually paid to do it12:55
Hobbseeand that it's certainly planned to be done at some point12:55
Hobbseethe sooner the better, obviously, but i don't overly want to write it myself, in current state12:57
ubotuNew bug: #180538 in malone "Email interface doesn't allow escaping quotes in summary line" [Undecided,New] https://launchpad.net/bugs/18053813:10
ubotuNew 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/18055413:50
=== bigon` is now known as bigon
emgentheya fabbione :)14:35
fabbionehi14:35
=== fabbione is now known as thegodfather
=== ``Cub1 is now known as ``Cube
mptGooooooooooooooooooooooooood afternoon Launchpadders!14:59
geserHi mpt15:00
ubotuNew bug: #180591 in launchpad "Can't edit/update the details that login.launchpad.net sends (dup-of: 177401)" [Undecided,New] https://launchpad.net/bugs/18059116:36
ubotuNew bug: #180593 in launchpad "Add option to disable @ubuntu.com email forwarding" [Undecided,New] https://launchpad.net/bugs/18059316:46
mptEgads17:25
=== neversfelde_ is now known as neversfelde
shiyeewhen 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?18:58
jelmershiyee: you may be able to run "bzr break-lock"19:00
shiyeejelmer: nope, same error19:01
shiyeeoh wait...19:01
shiyeejelmer: thx alot, that did the trick :-)19:02
=== \sh is now known as \sh_away
mtaylorstatik: someone should write a mylyn plugin for launchpad20:06
_flxhi20:21
_flxI would need help on the Bazaar system20:21
_flxI registered a main branch on Launchpad20:21
_flxaud made myself a dev branch20:22
_flxI made some changes in the dev branch20:22
_flxand clicked the "Propose for merging" in Launchpad so these changes could be merged into my trunk20:22
_flxbut I don't quite understand how to merge those together20:22
LarstiQ_flx: heh, you're probably the one who would be doing the merging :)20:23
LarstiQ_flx: cd main.branch; bzr merge url-to-dev-branch; *review changes*; bzr commit20:24
_flxLarstiQ, Oh.. I see.. I don't have the "main branch" on my system20:25
LarstiQ_flx: you do have the dev branch though?20:25
_flxLarstiQ, Yes20:25
_flxI "kind of" transformed my trunk branch into a dev branch20:27
_flxbut 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 it20:27
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 go20:28
_flxLarstiQ, 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 to20:29
LarstiQ_flx: that is indeed one way of working20:30
_flxLarstiQ, sounds good to me, altough I don't quite see the "P2P" aspect of it20:31
LarstiQ_flx: http://bazaar-vcs.org/Workflows may help20:33
_flxLarstiQ, What I evoked previously is, I think, the Decentralized with shared mainline20:34
_flxThe 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 mainline20:35
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:37
LarstiQ_flx: and the merging support is way more painful, although the svn people are working on that20:38
_flxLarstiQ, 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: yes20:39
LarstiQ_flx: or decide it's all wrong and never publish it, that's a great freedom of being decentralized20:40
_flxLarstiQ, Sounds interresting. Another question, what is the difference between the "bzr init-repo URL" and "bzr branch URL" ?20:40
_flxLarstiQ, I see. Launchpad is here to help publish/host branches.20:41
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 URL20:42
LarstiQ_flx: exactly20:42
LarstiQ_flx: (well, and bugtracking/translations/blueprints etc)20:42
_flxLarstiQ, 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 exactly20:43
LarstiQ_flx: you could just branch or bzr init to get a branch you can work and commit in20:44
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 faster20:45
_flxuhm ok20:46
_flxSounds less "egoist"20:46
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.lq20:47
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 mirror20:48
_flxok I just did that. Let me do some test, I might have some other questions20:49
LarstiQsure. 20:50
LarstiQ_flx: if they're all bzr related, we can also move it to #bzr20:50
_flxIt will be Launchpad related in few minutes ;)20:50
_flxOk I made a download of the trunk and a branch from it20:52
_flxI made a change into my branch (renamed a file)20:52
_flxif I "bzr commit", the change will be local only isn't it ? 20:52
LarstiQyes20:55
ubotuNew bug: #180644 in launchpad-bazaar "Branch status menu has long clumsy caption" [Undecided,New] https://launchpad.net/bugs/18064420:55
_flxLarstiQ, I didn't made a "bzr push" and tried to merge the branch into the trunk but it says it have nothing to do20:56
_flxLarstiQ, What is the error I made ?20:57
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 into20:58
LarstiQ_flx: from the trunk, what does 'bzr missing url-to-dev' report?20:58
_flxLarstiQ, it reports that I am missing 1 revision20:59
_flxLarstiQ, 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
_flxLarstiQ, Oh, I forgot a dot... I wrote ./branches instead of ../branches21:00
LarstiQ_flx: ah :)21:02
_flxLarstiQ, when trying to push to Launchpad, it says that there is no new revision to push21:02
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 example21:03
_flxLarstiQ, ok, it worked. Another thing is when trying to push my dev branch to Launchpad, it told me that my branches had diverged21:05
_flxLarstiQ, also, Launchpad is still showing the "Branches proposed to be merged into this one" line21:06
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 happened21:08
_flxLarstiQ, 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:12
_flxLarstiQ, yes21:13
LarstiQ_flx: ie, same revision ids? (bzr missing --show-ids)21:13
_flxyes21:14
LarstiQ_flx: could you pastebin that output?21:15
_flxLarstiQ, yes, sec21:15
_flxLarstiQ, http://pastebin.com/d3c6f2c0021:16
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 locally21:19
_flxLarstiQ, Okay so I guess it is normal21:19
LarstiQ_flx: if you would 'bzr push ../../trunk' locally from experimental-0.1, it would update the trunk with the new revision21:20
LarstiQ_flx: but which branch was it that complained about divergence?21:20
LarstiQor, which url21:20
LarstiQsince branches are identified by url21:20
_flxexperimental-1.0 locally vs experimental-1.0 Launchpad21:20
LarstiQ_flx: ok, so could you run missing between those two?21:21
_flxhttp://pastebin.com/d2938db9021:23
LarstiQ_flx: ok, so there it's genuinely diverged.21:25
_flxLarstiQ, What can I do to fix this ?21:25
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 --overwrite21:26
_flxgood21:26
_flxLarstiQ, it worked21:27
_flxLarstiQ, Now in Launchpad, how can I get rid of the "This branch is proposed for merging into"21:27
LarstiQ_flx: now that is actually something I'm not familiar with, give me a minute to read up on it21:28
_flxLarstiQ, I found a way to just delete the proposal. Thx for all your advices, you were very helpful21:37
LarstiQ_flx: np, pleased to be of help21:37

Generated by irclog2html.py 2.7 by Marius Gedminas - find it at mg.pov.lt!