[00:03] slangasek, I've uploaded a new gdm revision with a 2 liners bug fix from brastche [00:03] bratsche [00:05] Does anybody know why preseeding the Hardy installer with lilo-installer/skip=true isn't working? === rickspencer3 is now known as rickspencer3-afk [00:21] slangasek: Next release :) [00:26] pitti: what's the state of apport in Fedora? I was approached today by a SUSE dev who was interested in it for them as well. [00:30] jdstrand: / ajmitch: ping, please update your jack-sense bugs when you have a chance. the upstream merge window is very quickly closing. [00:34] dtchen: sorry to not catch up with you, I've had problems getting it built [00:36] ajmitch: where is it ftbfs? [00:36] at one point it was in that patch, but subsequent updates from the tree had it failing in other places [00:37] I expect that I'm not building the kernel properly [00:37] ok, i'll take a look at it this weekend [00:37] in the meantime, can you try with just enable_msi=1? [00:37] (with whichever Karmic kernel you have access to) [00:37] I'll give that a try === robbiew1 is now known as robbiew === robbiew1 is now known as robbiew [00:45] ajmitch: e.g., sudo /sbin/alsa force-unload && sudo modprobe snd-hda-intel enable_msi=1 [00:46] dtchen: bad news is that doesn't change anything [00:46] only in way. [00:47] good news is that it's already fixed, but you likely need an msi whitelist addition in addition to the model quirk [00:47] ok [00:47] more hacking on the plane, i suppose [00:47] do you need anything added to the bug report? [00:47] not currently, thanks [00:48] slangasek, do you have buildd super powers? [00:48] mdz: no, sorry [00:48] anyone around who does? [00:48] kees: do you? ^^ [00:51] slangasek, mdz: no, sorry. only the GSAs can get to the buildds, I think. [00:51] mdz: check with lamont or pjdc [00:51] there's the buildd group that lets people manage the build queues, I supposed that's what mdz was asking after [00:51] yes [00:52] I have a PPA build I'm urgently waiting on [00:52] jono: http://www.youtube.com/watch?v=-0wc4LCSqHI [00:53] mdz: btw, euca just finished publishing and the server ISO build is starting now [00:54] mdz: I do have a non-virtual PPA, if you don't get your build priority sorted out; I could push a karmic PPA build through those if you need. [00:54] slangasek, thanks === robbiew1 is now known as robbiew [00:55] kees: You could rescore the build for mdz too [00:55] :-) [00:55] maxb: I don't think I have that ability. [00:55] maxb: but if I do, please show me how. :) [00:56] ~techboard is a member of ~launchpad-buildd-admins [00:56] * kees didn't realize he had new super powers, and goes looking [00:56] slangasek, FYI I have the next eucalyptus rev in a PPA right now and plan to hack up a server ISO to test it locally before uploading [00:57] Not that I've ever seen the UI myself, but I'd imagine if you find mdz's build there should be a link to allow you to edit its score [00:57] mdz: ok [00:57] maxb, there used to be an obvious link for rescoring the build (I'm in techboard as well), but no longer [00:57] anyway, it's started now === robbiew1 is now known as robbiew [01:04] mdz, kirkland: http://cdimage.ubuntu.com/ubuntu-server/daily/20090925/ [01:05] slangasek: cool, thanks [01:06] mdz: this is what i'm working with: https://help.ubuntu.com/community/Eucalyptus [01:06] mdz: but it's very dated (jaunty era) [01:12] mdz: update -> http://open.eucalyptus.com/wiki/EucalyptusAdministratorGuide_v1.6 [01:13] slangasek, can you give me the magic mkisofs options for the official isos? [01:14] mdz: hrm, digging through the debian-cd config [01:16] mdz: eh, easier to get it by grepping the log file... pastebinning [01:16] mdz: http://paste.ubuntu.com/277507/ [01:18] slangasek, thanks [01:19] slangasek, sorry, I should have specified amd64 [01:19] mdz: ah, grabbing [01:19] mdz: here: http://paste.ubuntu.com/277509/ [01:21] slangasek, what is boot1? [01:22] mdz: directory containing the bits that debian-cd puts together for the bootloader... [01:22] slangasek, hmm, I don't remember needing that in the past [01:23] I assume the contents end up in the iso and the ones there will work fine [01:23] mdz: correct - it's the contents of the isolinux subdir [01:25] slangasek, hmm, it's not cooperating [01:25] genisoimage -r -V Ubuntu-Server\ 9.10\ amd64 -o karmic-server-amd64+plumbers.raw -cache-inodes -J -l -b isolinux/isolinux.bin -c isolinux/boot.cat -no-emul-boot -boot-load-size 4 -boot-info-table /media/cdrom [01:25] I: -input-charset not specified, using utf-8 (detected in locale settings) [01:25] genisoimage: Uh oh, I cant find the boot catalog directory 'isolinux'! [01:26] /media/cdrom/isolinux exists and contains the usual assortment [01:32] mdz: mm - really don't know :( [01:32] mdz: I trust debian-cd to get this right for me [01:35] mdz: I guess the first thing I would try would be to split the boot stuff out into a separate parent directory and build it the same way debian-cd does (boot1/ CD1/ ) [01:38] slangasek, I'm pretty sure it just reads each pathspec in turn, that the first one isn't special [01:39] I'm also using genisoimage rather than mkisofs, because it's what I have here [01:39] and I'm using the karmic version [01:40] strace doesn't even show it reading in the directory [01:42] I wonder if it's simply broken [01:44] slangasek, arrgh, it chokes if the pathspec is a symlink [01:51] jcastro, so Bill has VT capable hardware to test? [01:51] he's joining in a sec [01:52] WildBill: ok so you have kvm-capable hardware right? [01:52] a couple of pieces of gear, yeah [01:52] laptops mostly LOL [01:52] but yeah [01:52] dual core, 2GB RAM [01:53] jono_: ^ [01:53] awesome [01:53] thanks WildBill [01:53] thank me when we're done LOL [01:53] it'll be fun tho :) [01:54] WildBill, keep an eye on http://testcases.qa.ubuntu.com/System/Eucalyptus for updates [01:54] WildBill, kirkland is going to add further test instructions there when he is done === jono_ is now known as jono [01:54] oh damn, that looks easier than the other stuff I was reading :) [01:55] WildBill: oh don't worry, this is in addition to [01:55] WildBill: oh, that's the easy part [01:56] haha yeah [02:01] so when does this testing start? [02:42] WildBill, they are still working on the ISOs [03:08] WildBill: The testing won't start till next week, at least for the beta isos that is. [03:13] This is related to development, and just a curiosity... Why does it seem to take substantially longer for the changelogs to be available compared to the packages? (I'm always running a +1 version of Ubuntu, so I've noticed this for a long time) [03:16] ScislaC: The changelogs are only extracted every few hours, by a process completely separate from the package publishing. [03:18] wgrant: ahhh! Is the any reason why they are pulled like that as opposed to being pushed when the builds complete successfully? (not trying to say I know better, just wondering) [03:19] ScislaC: Not really. They should eventually be extracted by Launchpad once the build completes and made available immediately, but that's not done yet. === Whoopie_ is now known as Whoopie [03:20] wgrant: gotcha... thanks for the info! :) [04:51] so starting jaunty from startx in tty1, the 90consolekit script runs, but my session active = FALSE [04:51] will this still be a problem in karmic? [05:00] c [05:03] :( [06:05] one day, I'd like to travel *without* either my home DSL, mail server or laptop hard drive dying [06:07] should be possible to manage that for one day, perhaps two, but that's not enough time to get very far [06:36] yup [06:36] my laptop has the unmistakable "click of death" [06:41] :( [06:55] it's all evan's fault [06:57] Good morning [06:57] kees: I didn't hear from Fedora about Apport for a long time; seems they don't like it [07:04] jcastro: is there some way to confirm UDS applications have gone through? [07:15] pitti: aren't they NIHing it? [07:15] Keybuk: Lennart once wrote a script which intercepts core dumps, yes [07:16] but I have no idea how far that got; I just commented on his blog post [07:16] clarifying that apport is FOSS (there were rumours that it's some proprietary code on Canonical's server..) [07:19] whose blog post? [07:20] Keybuk: http://0pointer.de/blog/projects/automatic-backtrace.html [07:21] right, that was quite a while ago now [07:22] therefore "didn't hear something for a while" [07:22] http://fedoraproject.org/wiki/Features/CrashHandling [07:22] yes [07:22] Fedora plan to NIH apport [07:23] also http://fedoraproject.org/wiki/Features/CrashCatcher [07:24] nih? [07:24] TheMuso: not-invented-here. In this context I suppose they want to reinvent it just because we wrote it [07:24] kinda [07:24] more because they *didn't* write it [07:24] Right. [07:25] RH/Fedora have a real problem with that [07:25] Don't they just. [07:26] like the time they included screenshots of an Ubuntu tool in their Features/ wiki page, with the comments "make it look and work like this tool in Ubuntu": [07:43] ooh, apparmor in the queue -- I can haz network in live system again? === mpt_ is now known as mpt [08:47] pitti: hi, good morning! we currently don't have a way in LP translations of tracking which packages are promoted to main or demoted, and we often find out quite late in the cycle that e.g. we have to disable templates of demoted packages. Do you know if there is a place where MIR or demotions can be tracked, so we can have a look at it? [08:48] dpm: hm, tricky; there's no log of demotions, since they by and large "just happen" when some archve admin cleans up component-mismatches [08:48] dpm: for promotions most packages go through the MIR process, so the ~ubuntu-mir bugs tell them [08:49] dpm: but I think it'd be easier to periodically run a script which compares the packages which Rosetta thinks are in main, and which are actually in main [08:52] pitti: sounds like a good idea, thanks. Which do you think would be the best way to find out which packages are in main? [08:54] dpm: how about [08:54] wget -O - http://archive.ubuntu.com/ubuntu/dists/karmic/main/source/Sources.gz | zgrep ^Package: | cut -f2 -d' ' [08:57] dpm: That's the fastest way I know of if you have network [08:58] fantastic, thanks a lot, pitti [09:13] ebroder: there's a changelog entry in lilo-installer after hardy indicating that it was fixed; you might want to look at the changelog and chase the bug reference there === asac_ is now known as asac [09:16] TheMuso: testing (your reply to WildBill): this is a special effort to get eucalyptus testing earlier than the beta ISOs [09:19] dpm: FWIW if you're doing anything more complicated with Packages or Sources files than that zgrep | cut of pitti's, you'd be well-advised to look at grep-dctrl === tkamppeter_ is now known as tkamppeter [09:22] cjwatson: thanks a lot for the info, I didn't know about it and I'm sure it'll be very useful [09:30] pitti: I think bug #428662 is really a duplicate of bug #364508 however the former seems more specific to karmic while the latter is also about jaunty [09:30] Launchpad bug 428662 in xserver-xorg-video-intel "kdm crashes system on logout" [High,Confirmed] https://launchpad.net/bugs/428662 [09:30] Launchpad bug 364508 in xserver-xorg-video-intel "[i965gm kms ] X crash on kde 4 logout" [High,Confirmed] https://launchpad.net/bugs/364508 [09:30] tseliot: oh, it sounded as if it was a recent regression [09:30] pitti: the upstream report is recent [09:31] hmm [09:31] pitti: either way a fix is available :-) [09:31] oooh! [09:32] ooh? [09:32] pitti: Would you mind kicking moblin-remix-meta out of NEW please? It was ETARGET :-( [09:32] :-) [09:32] lool: you mean "reject"? [09:32] Yeah [09:32] delete, burn, whatever :-) [09:33] * pitti makes a flush noise [09:33] pitti: thanks [09:33] pitti: wash your hands [09:33] tseliot: fix to intel, or a workaround in kdm? [09:33] pitti: a proper fix in the -intel driver [09:33] lool: soyuz is sterile! [09:33] it has no bugz [09:33] tseliot: rockin' [09:34] :-) [09:34] tseliot: does the fix look harmless enough for beta? or very intrusive? [09:35] pitti: either we upgrade to the latest driver (we're discussing this with upstream) or I could backport the fix (if possible) [09:42] pitti: it looks like the fix is trivial to port [09:57] great [10:01] metacity --replace [10:02] geser.fix_focus() [10:09] pitti: it's hard to type into the right window when you can't see anything (was trying out gnome-shell) [10:16] geser - so gnome-shell is working well for you then? ;) [10:17] chrisccoulson: if you count a black distorted screen to it, then yes [10:18] heh. i tried it a few days ago as well. i think i probably had a bit more success than that, but it is unbearably slow on my factory-overclocked nvidia 8800gt, which is somewhat surprising [10:20] geser: gnome-shell ftw! [10:21] chrisccoulson: does it need 3d acceleration? because I only use the 2d radeon driver and not fglrx [10:21] chrisccoulson: I think that's a driver issue. I can use it (no games though) without problems. glxgears shows me 3-4 times less frames [10:21] geser: imho yes [10:21] geser - yes, it needs 3d [10:21] there is no fallback with clutter unfortunately [10:22] there's been a lot of discussion about this upstream, as a few people disagree with the decision not to include a fallback [10:22] apparently, the "fallback" will be gnome-panel and metacity;) [10:23] chrisccoulson: haha, how long is the question [10:24] at least there will be a fallback for those without 3d or with old hardware (perhaps it's time I switch to fglrx finally) [10:24] geser: FLOSS ftw! but yes, change [10:24] ^^ [10:25] ArneGoetje: sorry for the delay, replied to you on -devel now [10:26] sebner / geser - if you're interested in reading about the discussion, it is here: http://www.mail-archive.com/desktop-devel-list@gnome.org/msg15609.html [10:27] chrisccoulson: cool, thx [10:37] lool: it should be safe now to give-back cheetah on ia64 to resolve the upload error (as the source in now published in main (and not pending anymore)) [10:38] geser: thanks [10:38] geser: Did you confirm this with bigjools? [10:39] lool: no, but I've seen this error several times already and it was always because the source package got promoted at the same time [10:40] That's right. [10:40] A give-back after the subsequent publisher run will work fine. [10:40] The important bit is that the old one is Superseded, not that the new one is Published, although those generally happen at the same time. [10:40] geser, wgrant: thanks given back [10:40] If I still have audio problems in karmic should I ubuntu-bug alsa-base or pulseaudio? [11:11] welcome to emo-os [11:14] hmm, GDM only starts now if you have a working Internet connection when it starts :) [11:17] mvo: "AttributeError: 'DistUpgradeQuirks' object has no attribute '_killKBluetooth' [11:17] crash in DistUpgrade tool [11:18] http://paste.ubuntu.com:80/277786/ === yofel_ is now known as yofel [12:07] Riddell: thanks, fixing now (and sorry) [12:18] mathiaz: I just wanted to give you a heads-up that some major changes are going to be rolling into the SSSD today, in time for our 0.6.0 release. They change the format of the configuration file, but we're also shipping an upgrade script in the tarball, so you may want to roll that into whatever .deb has as a post-install section. [12:25] Have most of the games been removed by default? [12:54] dtchen: hi. I (finally) tested the patches you asked me to test in bug #400682 [12:54] Launchpad bug 400682 in linux "[Karmic stac9227 regression] No sound after upgrade from Jaunty to Karmic" [Medium,Fix committed] https://launchpad.net/bugs/400682 [12:54] dtchen: I updated the bug, but in summary, it FTBFS [13:04] tseliot, was there an update to some nvidia-glx-185 (or related package) between yesterday or today? [13:05] kenvandine, seb128: Was there an update to libwnck between yesterday and today? [13:05] MacSlow: What exploded? :) [13:06] Amaranth, hey Travis [13:06] howdy [13:07] Amaranth, notify-osd causes libwnck assertions and thus failing to display any notification bubbles if I run my setup with two LCDs... yesterday everything was smooth as silk [13:07] there was a compiz update [13:07] shouldn't have affected anything like that though [13:09] Amaranth, not compiz-related I think.. the issue also occurs under metacity (without compositor) [13:09] MacSlow: libwnck hasn't been updated since the 22nd and nvidia-glx-185 hasn't been updated since august [13:09] gee... what bloody side-effect is hitting me here then I wonder [13:20] MacSlow, no [13:21] it didn't change for weeks [13:21] the recent update was translations only [13:21] seb128, somehow a bug was triggered between yesterday and today on my nvidia-based system causing bubbles to no longer appear in a dual-LCD setup [13:22] seb128, disabling the second lcd got the rendering back in order again === doko__ is now known as doko [13:23] seb128, dual-LCDs on my nvidia-box worked with notify-osd for months before (even under karmic until this morning) [13:23] bubbles? [13:23] soren, how do you call notification rectangles with text? [13:24] soren, it's usually called bubble [13:24] Oh, those! [13:24] :) [13:24] soren, yes ;-) [13:24] I thought this was some sort of compiz effect like the wobbly windows or whatnot :) [13:24] soren, the term "bubble" is not official though [13:25] soren, just wanted something to differentiate from notifications rendered by notification-daemon [13:26] MacSlow: Sure, sure, I follow you now. My mind was elsewhere :) [13:26] soren, that's why sometime during the jaunty cycle I refered to them as bubbles [13:27] notification-rendition would be the more fitting term I guess [13:27] empathy calls them "bubble notifications", gwibber calls them bubbles ;) [13:27] but such long terms are very inconvenient [13:28] hey ng [13:29] hey :) [13:31] jussi01: pm me your name and i can check the system [13:34] anyone happen to know why today's desktop CD doesn't automatically switch to vt7? === MacSlow is now known as MacSlow|lunch [13:55] anybody else seen anything like bug 436590? [13:55] Launchpad bug 436590 in update-manager "Hang up upgrade with aptdaemon" [Undecided,New] https://launchpad.net/bugs/436590 [13:56] I guess it would be high priority if it affected more than just me [13:56] james_w: absolutely [13:56] james_w: is it still running? [13:56] yes [13:57] I can gather any information that you need [13:57] james_w: could you mail me the output of ps afx (or attach if it does not contain anything private) [14:00] mvo: mailed [14:02] james_w: thanks, I see if I can reproduce it here [14:02] mvo: great, thanks. I'm going to grab some lunch [14:02] mvo: when was the switch to aptd done? [14:04] oh, I forgot one thing [14:04] added to the bug [14:06] cjwatson: uh, confirmed here [14:06] james_w: was there debconf involved at any time (other than the message printed there)? [14:07] Hello mvo and james_w, it seems that richard is now open to a conf file conflict and debconf integration into packagekit [14:07] mvo: no prompts, no conffile prompts, nothing [14:07] hello glatzor, I saw, nice work [14:07] cjwatson: the current CD has various problems due to Apparmor being active on the live system; but it seems a weird thing to be triggered by AppArmor.. [14:08] pitti, the vt thing is not liveCD specific [14:08] pitti: does "ubuntu-bug " do the version checks too? [14:08] I've read comments going on on bugs for some days [14:08] james_w: yes, same mechanics [14:09] but I've no clue about those and Keybuk seems to refuse looking at those and just point it's gdm issues without any clue of why [14:09] pitti: ok. Not ideal for reporting problems with upgrading, but I guess we don't need everyone to do that [14:09] glatzor: yeah, good stuff [14:09] james_w: don't you get automatic reports for that from apt? [14:10] pitti: well, not in this case, there aren't upgrade failures or crashes, I've got a hang in update-manager/aptdaemon [14:11] anyhow, we can manage [14:12] pitti: are you affected by bug #428662 ? [14:12] Launchpad bug 428662 in xserver-xorg-video-intel "kdm crashes system on logout" [High,Confirmed] https://launchpad.net/bugs/428662 [14:14] pitti, any clue about bug #436515? [14:14] Launchpad bug 436515 in gdm "GDM doesn't start when DNS lookups aren't available" [Medium,New] https://launchpad.net/bugs/436515 [14:18] tseliot: no, it only seems to affect kdm [14:18] seb128: looking; missing lo? [14:19] pitti, I'm not sure, I was just wondering [14:23] ok === cyphermo1 is now known as cyphermox === MacSlow|lunch is now known as MacSlow [14:38] meh. what does one do when dpkg gets corrupted? [14:38] is there a way to regenerate the metadata? [14:41] hmm.. what's in /var/lib/dpkg/updates anyway? [14:48] cjwatson: hi [14:48] hello? [14:48] I've just seen the bug you report on the python webkit binding [14:48] (I am the current debian maintener) [14:48] that was quick! [14:48] :) [14:49] I am subscribed to it :) [14:49] what can I do to help out ? [14:49] Kmos: thanks. [14:49] well, there's a test case on the bug [14:49] the package with the data in it is Ubuntu-specific, but it has no dependencies so it should be easy to install [14:49] ok [14:50] cjwatson: I know that it is ubuntu specific (I am also a motu :)) [14:50] I got it to the point where as far as I could see it wasn't a bug in the calling script [14:50] but if that's a mistake, obviously feel free to reassign back with my apologies; I'd like to know what we're doing wrong if so, though [14:50] I might be good to ask the upstream author about it [14:50] he is usually very quick to aswer [14:50] answer [14:51] james_w, i think i understand why this is the case, but just wanted to let you know its at least annoying. http://paste.ubuntu.com/277965/ [14:52] cjwatson: it might be great also to test that against the new upstream release [14:52] I'll try to do that this weekend [14:52] I'll let you know before monday [14:53] hmph. i still get funny messages about init on shutdown. i heard rumours of a shutdown splash screen! :( [14:59] smoser: more than a little annoying as well [15:03] james_w, anything can be done ? [15:03] i can open a bug if need be [15:04] smoser: you either have to upgrade/downgrade one of the branches so that they match [15:04] or go through some painful machinations to avoid the default stacking [15:04] I think there is a bug already [15:04] well i can't change the ubuntu/ec2-init, right ? [15:04] so the only option is upgrading the other [15:11] smoser: you could ask soren to change that one, but it's probably easier to change yours [15:12] ah.. you mean downgrade mine ? how would i do that ? [15:14] you can do it using the upgrade command [15:14] "bzr upgrade --format" [15:15] --rich-root-pack is what you would want in this case it seems [15:17] thanks. i was just going to ask you how i de-coded KnitPackRepository to something that --format would like [15:18] james_w, :-( it tells me i can't do that. [15:18] bzr: ERROR: Cannot convert from format Branch format 7 to format . No converter [15:18] really? [15:18] man [15:18] well i didn't just make up that error :) [15:18] ok, let's try and trick it [15:18] or if i did, it was convincing wasn't it [15:18] well, it's pretty convincing if you did :-) [15:19] bzr init-repo --rich-root-pack /tmp/testrepo [15:19] bzr init /tmp/testrepo/trunk [15:19] bzr pull -d /tmp/testrepo/trunk . [15:20] that will create a repository in the desired format, and then try and pull all the data in to it [15:22] hm.. i think i'm missing something. [15:22] what dir should i be in to start that? [15:24] the branch you are trying to push [15:24] "bzr pull -d /tmp/testrepo/trunk ." means pull . from /tmp/testrepo... [15:24] you can cd and bzr pull the path to your current branch instead if you like [15:25] hm... i think it worked. [15:32] who promoted libgnumail-java-doc? [15:32] james_w: me, on error; I put it back to universe [15:33] since it sucks in classpath [15:33] thanks [15:33] we should instead blacklist it in the seeds or so [15:33] I thought I was going crazy [15:33] (extra-exclude is what you want) [15:33] that's twice I demoted and it came back [15:33] pitti: what tries to pull it in? [15:33] james_w: it seemed like a simple thing at first (like the other -doc and -dbg that turn up all the time), I checked classpath too late; sorry [15:34] james_w: there's a general seed rule to "rescue" *-dbg and *-doc [15:34] ah [15:34] so that we dno't have to explicitly seed the million -dev/-doc packages for main sources [15:34] clever [15:35] cjwatson: in "supported" for all derivatives, right? [15:35] yes :-/ [15:35] smoser: So you managed to push it in a format I can merge frm? [15:35] james_w, thanks for your help... i dont think it all worked perfectly, as i tried to reproduce but failed. [15:35] soren, i think so. [15:35] smoser: Where? [15:36] soren, if not, i'll just manually cherry pick [15:36] james_w: doing the seed changes now [15:36] * james_w hugs pitti [15:36] soren, oh. wait. i hadn't done that yet. let me try [15:36] smoser: Where did you push it to? [15:36] smoser: Cool, thanks. [15:37] cjwatson: out of interest, why doesn't that work in platform.karmic/supported-common? [15:37] smoser: Oh, did you base this on the ubuntu package branch of the ec2-init trunk? [15:38] right [15:38] wait [15:38] pitti: it probably could be made to but I haven't tried. check it with germinate if you do [15:38] i started from lp:ubuntu/ec2-init [15:38] smoser: Ah, ok. [15:38] is that ok ? [15:38] I'm.... not sure. [15:39] james_w: Ok, here's the thing.. [15:39] james_w: I maintain ec2-init in bzr. [15:39] james_w: smoser wanted to patch a few things, grabbed the lp:ubuntu/ec2-init branch and made some changes. [15:39] james_w: I like the changes, so I want them in the ec2-init trunk. [15:39] james_w: What's the magic incantation here? [15:40] james_w: If I just try to merge it, it tells me there are no common ancestors. [15:55] soren: yeah, there aren't. It's one of the unfortunate things about the lp:ubuntu/* branches. [15:56] making each of them mergeable with their respective upstream branches is a lot of work, so we deferred that part until later [15:56] james_w: There aren't common ancestors or there aren't a way to do this? [15:56] I understand the former, fwiw. [15:56] soren, you can't merge them, but you can certainly get the changes from one place to the other. it is just extra work [15:56] if you cherrypick it should work [15:57] oh, no it won't [15:57] the file-ids differ [15:57] mdz: Like "bzr log -c revno -p" or some such? [15:57] it's diff and patch I'm afraid [15:57]