[00:06] <lifeless> a212901390231901: :(
[00:06] <lifeless> a212901390231901: there is probably going to be a netbook or something if we ask around
[00:14] <a212901390231901> I'm going to stick key and a few things on a usb stick and leave this box up with the server
[00:18] <a212901390231901> do you know if there's anything particular we have to do on arrival Robert?
[00:18] <lifeless> register for your room
[00:18] <lifeless> have you read mariannas email?
[00:18] <a212901390231901> walking up to front desk and declaring my email address doesn't seem quite right
[00:18] <a212901390231901> yup.
[00:19] <lifeless> name, rank, serial number
[00:19] <a212901390231901> the "IMPORTANT: Bazaar Sprint (during UDS), 10-14 May 2010" doesn't seem to say anything about checking in as such
[00:20] <lifeless> there will be a front desk
[00:20] <lifeless> name the event and your details
[00:20] <lifeless> thats usuaully all it takes
[00:21] <a212901390231901> thanks.
[00:22] <lifeless> do you have a phone that will roam ?
[00:22] <a212901390231901> there's also a hotel shuffle thing, but I don't think I need to worry about that till monday.
[00:22] <a212901390231901> I believe UK mobiles are fine on the continent, if that's what you mean
[00:22] <a212901390231901> used it there before.
[00:22] <lifeless> if you do, just make sure you have mariannas mobile, and mine too if you like
[00:23] <a212901390231901> good thought.
[00:49] <kojiro> I forgot to add and commit one file that was supposed to go with stuff I already committed. Is there any way to add the file and make it part of the previous commit?
[00:51] <xnox> kojiro, if you didn't publish your results you can do
[00:51] <Peng_> kojiro: If you haven't pushed yet, make a copy of your commit message, "bzr uncommit", "bzr add", "bzr commit".
[00:51] <xnox> yes Peng_ was quicker =)
[00:51] <kojiro> heh, to me the posts look simultaneous
[00:52] <Peng> xnonx was first from my POV, but it was within a second.
[00:52]  * xnox has 1.1s lag with the server
[00:53] <xnox> so to me I was half way through typing uncommit, add, commit and then i saw Peng
[00:54] <kojiro> thanks, gents
[00:54] <kojiro> hate to ask and run, but I gotta get home
[06:37] <godbyk> For the project I work on, we have a new series in launchpad that is currently based on the main series (https://launchpad.net/ubuntu-manual/+series).
[06:38] <godbyk> We have a bunch of cruft in the main series that I would like to drop in the lucid-e2 branch. Deleting the files leaves behind all the history and whatnot, so pulling a fresh copy of lucid-e2 is a 200 MB download.
[06:38] <godbyk> Is there a way I can either purge the history of files that no longer exist or a way to safely kill that branch and create a fresh one in its place without removing the milestones, etc. in launchpad?
[06:38] <godbyk> (if this is a question that should be directed to #launchpad, let me know.)
[06:38] <godbyk> thanks for your help!
[06:52] <xnox> godbyk, mark the branch as abandoned and set a different branch as a series target
[06:53] <xnox> godbyk, if there is a lot of work you can use $ bzr fast-export && bzr fast-import-filter
[06:53] <xnox> milestones have no meaning with respect to branches only series do.
[06:53] <xnox> and you can change which branch series point at easily
[06:54] <godbyk> xnox: that sounds perfect! thanks for your help.  (I see now in the series settings where it's pointed at the bzr branch.)
[07:00] <lifeless> vila: https://code.edge.launchpad.net/~lifeless/bzr/bug-558343-wrong-host-with-proxy/+merge/24938
[14:41] <dcoles> If I'm using bazaar to mirror another VCS system's repository, it's generally a bad idea to use a non-determanistic importer unless I'm always the one doing the importing, correct?
[14:42] <dcoles> Because if someone tries to pull from the original VCS with something like bzr-fastimport we'll get diverging revision IDs.
[18:04] <lifeless> hai
[19:01] <thrillERboy> I tried to create a new project on launchpad
[19:01] <thrillERboy> My file is showning non-versioned in bazaar, so I can push those files, how to add versions to files?
[19:02] <thrillERboy> OMG its in Topic I guess, lemme go thru it
[19:13] <idnaria> thrillERboy_: I believe you want the "bzr add" command
[20:14] <eric_f> When a merge conflict occurs, which file is the newest one from the repo I tried to bzr update from? .BASE or .THIS?
[20:16] <Peng_> .THIS is this branch's copy of the file, .OTHER is the copy in the branch you're trying to merge in, and .BASE is their common ancestor.
[20:16] <Peng_> So .BASE is the oldest.
[20:17] <eric_f> that means .OTHER would be the newest from the repo I'm bound to then, correct?
[20:17] <eric_f> in this case the file I want… (it's a binary one)
[20:18] <Peng_> Yeah.
[20:18] <eric_f> Peng: thanks! :-)
[22:12] <fbond> lla
[22:40] <thumper> jelmer_: we are getting the bzr-svn config concurrent write issue again, this time causes a number of imports to be marked as failing
[23:50] <slangasek> gah, I've just been screwed by trying to use bzr commit --local on a branch bound to an Ubuntu lucid package branch
[23:50] <slangasek> because 'bzr update && bzr commit' fails since lucid is no longer writable
[23:51] <slangasek> how can I get the previous tip revision back on top?
[23:59] <slangasek> n/m, found the answer