[01:35] <keithy> hi
[01:35] <keithy> I just used the mac os x installer and it hosed by bazaar installation
[01:36] <keithy> which bzr -> /usr/local/bin/bzr
[01:36] <keithy> ok nevermind
[01:36] <keithy> new shell solved it
[01:42] <mwhudson> igc: did you think about using btrees for revgraphcache?
[01:43] <igc> mwhudson: jam has told me I should but I'm yet to do that
[01:43] <mwhudson> igc: ok, if jam thinks it's a good idea, it probably is :)
[01:44] <mwhudson> igc: it seems i'm going to be working on loggerhead some more, and i want to use revnocache, so
[01:44] <mwhudson> igc: need help with anything?
[01:44] <mwhudson> igc: and i find the names confusing; is revgraphcache the way of the future?
[01:46] <igc> mwhudson: I would *love* some help with revnocache
[01:47] <igc> there's a lot that can be done there and a small amount of it may make it into the core in the future
[01:49] <igc> mwhudson: I'll whip up a TODO file and commit that so you can see the priorities as I see them
[01:54] <lifeless> who here has read the groupcompress stuff enough to grok the design
[01:57] <mwhudson> igc: thanks
[01:58] <lifeless> 3.3G corpus makes my laptop cry
[02:02] <mwhudson> igc: TODO as i see it: incremental caching updating + use btrees
[02:02] <mwhudson> igc: not sure there's much else tbh
[02:03] <santagada> lifeless: is bzr one of the projects that will be able to use snakebite?
[02:03] <keithy> hmm on windows where does bazaar ssh keep its config files?
[02:03] <lifeless> santagada: snakebite ?
[02:03] <keithy> I want to put some ssh keys in there
[02:04] <keithy> hello lifeless
[02:04] <lifeless> mwhudson: incremental writes for incremental updates
[02:04] <santagada> lifeless: www.snakebite.org
[02:04] <keithy> I just updated to 1.11
[02:04] <lifeless> hi keithy, cool
[02:04] <santagada> lifeless: to sum it up they have one machine with 48gb of ram
[02:04] <santagada> :)
[02:04] <mwhudson> lifeless: ah yes, btrees are write once?
[02:05] <lifeless> mwhudson: yes
[02:05] <mwhudson> that's something of a pain
[02:05] <lifeless> mwhudson: not really
[02:05] <mwhudson> could always abuse the heck out of sqlite again...
[02:05] <mwhudson> lifeless: for this application it is, i think?
[02:05] <lifeless> mwhudson: you can build on top of it; I have a plan!
[02:05] <mwhudson> i mean, it's less important than having to read the whole lot of it, for sure
[02:06] <mwhudson> lifeless: ah!
[02:06] <mwhudson> lifeless: tell me more
[02:06] <lifeless> mwhudson: and its important that they are write once, because our fs layer does not have updatable files per se
[02:06] <lifeless> mwhudson: due to sftp and ftp
[02:07] <mwhudson> lifeless: well yes, i don't care about bazaar's needs here
[02:11] <lifeless> mwhudson: in the long term you do, because we need an answer in bzr itself, and if its different to what you do, its waste
[02:17] <lifeless> mwhudson: also write once has nice cache characteristics, and when you look at eq sqlite internals its essentially writing once at the page layer
[02:17] <lifeless> mwhudson: anyhow, take a series of btrees
[02:17] <lifeless> query new->old
[02:17] <lifeless> take first hit for a value
[02:17] <lifeless> write a special value for deletes
[02:17] <lifeless> and as the length expands and hits on old trees decrease, repack
[02:17] <mwhudson> i guess you could do pack repo-like reshuffling too
[02:18] <mwhudson> right
[02:18] <keithy> on windows where does bazaar ssh keep its config files?
[02:18] <mwhudson> is the logic for this for pack repos extractable, do you think?
[02:18] <lifeless> keithy: I'm not sure, I think it depends on your ssh client
[02:18] <lifeless> keithy: its something bzr depends on but doesn't provide itself
[02:21] <sohail> hi, I have a shared repository and when I do bzr branch it is taking forever (> 2-3 minutes).. is there any way to figure out what is wrong?
[02:21] <lifeless> sohail: you're branching within the repository?
[02:22] <sohail> lifeless, I am doing bzr branch ~/code/bzr/master ~/bzr/code/bugfix
[02:22] <lifeless> sohail: so from the repository, to outside?
[02:22] <lifeless> or did you mistype one of those urls' ?
[02:23] <sohail> lifeless, well it seems that ~/bzr/code is the repository
[02:23] <sohail> so seems to be within...
[02:23] <sohail> bzr info ~/bzr/code/
[02:23] <sohail> Shared repository with trees (format: pack-0.92)
[02:23] <sohail> Location:
[02:23] <sohail>   shared repository: /home/sohail/bzr
[02:23] <lifeless> on one you said code/bzr
[02:23] <lifeless> on the other bzr/code
[02:23] <sohail> oops
[02:23] <sohail> yeah that's a typo
[02:23] <sohail> bzr/code in both cases
[02:23] <enigma> jelmer: I dug up more info about the "mergeinfo capable client" message.
[02:24] <lifeless> sohail: ok
[02:24] <lifeless> sohail: run bzr info on the result branch, pastebin the output please
[02:24] <enigma> jelmer: It doesn't seem like it's just a collabnet thing
[02:24] <enigma> jelmer: http://www.google.com/search?hl=en&q=Commits+require+mergeinfo-capable+client
[02:25] <enigma> jelmer: For example, there is some discussion of it here: http://groups.google.com/group/openbravo-development/browse_thread/thread/b2aa7aefe7cf14d6
[02:26] <enigma> jelmer: Supposedly "subversive" 0.7.1 supports it. (I haven't heard of subversive.)
[02:26] <sohail> lifeless, http://rafb.net/p/Y29aDO61.html
[02:27] <santagada> http://www.orkut.com.br/Main#CommMsgs.aspx?cmm=18655944&tid=5297825684124574372&na=4&nst=21&nid=18655944-5297825684124574372-5298061795656704676
[02:27] <santagada> sorry wrong channel
[02:28] <enigma> jelmer: I don't know if their code would be helpful at all. You can download it here: http://www.polarion.org/index.php?page=download&project=subversive
[02:28] <lifeless> sohail: ok
[02:28] <lifeless> sohail: so its a repository tree which means its creating a working copy
[02:29] <sohail> yeah, can I somehow make it so that there are no working copies in ~/bzr
[02:29] <lifeless> sohail: if you want to be able to edit the files at that path, thats normal; sounds like you have a big tree and the --hardlink option will help
[02:29] <lifeless> sohail: on the other hand if you don't want to be able to edit there
[02:29] <lifeless> just touch ~/bzr/code/.bzr/repository/no-working-trees
[02:30] <igc> mwhudson: TODO added. see https://code.edge.launchpad.net/~ian-clatworthy/bzr-revnocache/trunk
[02:30] <igc> beuno may be interested in this as well
[02:30]  * igc lunch
[02:31] <keithy> ok so I am using plink
[02:31] <keithy> how confusing why they couldnt just call it ssh
[02:32] <nDuff> keithy, ...for one, OpenSSH has that name, so overloading it would mean confusion.
[02:32] <nDuff> keithy, ...also, plink does more than just SSH unless I'm badly mistaken -- it also has serial, raw socket, telnet, etc. support.
[02:33] <keithy> k so where does it keep its keys
[02:33] <lifeless> keithy: I know nothing about plink; is there some specific thing you need to do - just ask, someone here may know
[02:34] <nDuff> keithy, I believe it keeps them in the registry, though it should also be able to talk to any running Pageant instance
[02:34] <nDuff> keithy, ...so launching Pageant and adding the keys through its GUI is probably the Right Thing.
[02:34]  * nDuff isn't principally a Windowsy type, btw, so his advice should be taken with a grain of salt.
[02:35] <sohail> lifeless, ok thanks
[02:35] <sohail> I don't want to edit there, you are right
[02:35] <keithy> I cant be bothered with pageant, its not my server
[02:36] <sohail> that did it
[02:36] <lifeless> keithy: so, what do you need to do - just get it working for you on that machine?
[02:36] <nDuff> keithy, ...hrm, you have plink but not pageant installed? They should both be bundled in the same PuTTY install package.
[02:36] <keithy> but aegpant is a daemon
[02:36] <lifeless> keithy: userspace
[02:36] <nDuff> keithy, right, but not a system service
[02:36] <nDuff> keithy, ...runs as the current user in the tray.
[02:37] <lifeless> keithy: its like ssh-agent, its normal to use it for each user
[02:37]  * sohail uses pageant with bzr+ssh
[02:37] <keithy> sigh something else to setup
[02:37]  * nDuff wanders homeward
[02:37] <keithy> the current user is the admin of the box I dont have a user
[02:38] <keithy> I am vncing to the box over a openvpn tunnel
[02:38] <keithy> so I aleady have security
[02:38] <keithy> so I am happy to give a passwordless key to ssh
[02:38] <lifeless> keithy: do that then
[02:38] <keithy> if I can only work out where to put it
[02:38] <lifeless> just run up pagent
[02:39] <lifeless> I think you can right click and tell it to import a key or somethin
[02:39] <keithy> which isnt installed as far as I can see
[02:39] <lifeless> oh :(
[02:40] <lifeless> I'd read plink documentation then
[02:42] <keithy> arrrgh
[02:42] <keithy> I cant download stuff
[02:44] <keithy> hmm "pageant is allready running"
[02:49] <lifeless> is it in the status area ?
[02:53] <keithy> aparently so
[02:53] <keithy> but it wants a ppk file
[02:53] <lifeless> time for google ;)
[02:54] <keithy> puttygen is supposed to vonvert
[02:54] <keithy> but it only does private keys
[02:54] <lifeless> thats what you need isn't it ?
[02:56] <keithy> my private key is mine
[02:57] <lifeless> of course
[02:57] <lifeless> why don't you describe your use case
[02:57] <lifeless> I'm thoroughly confused
[02:57] <keithy> I want to give my public key to  ssh on the remote box
[02:57] <keithy> so he can log in
[02:57] <keithy> its almost as if no one has ever done this before
[02:57] <lifeless> hang on
[02:57] <lifeless> you want to setup a ssh *server* on the windows machine?
[02:58] <lifeless> or a ssh *client*?
[03:00] <keithy> ssh client
[03:00] <lifeless> if you are setting up an ssh client, it needs a private key
[03:00] <lifeless> the ssh server holds the public key
[03:01] <lifeless> if its for your colleague to use, he should setup a private key of his own, and give the ssh server operator his public key.
[03:03] <keithy> ok..
[03:03] <keithy> its late!
[03:04] <lifeless> :)
[03:17] <keithy> wahoo it worked
[03:30] <igc> That's it for me today - see everyone tomorrow
[03:31] <lifeless> ciao
[03:42] <keithy> thanks lifeless, time for bed
[03:58] <lifeless> spiv: the other odd thing about pdb:
[03:58] <lifeless> (Pdb) raise
[03:58] <lifeless> *** AttributeError: Pdb instance has no attribute 'do_raise'
[03:59] <spiv> Yeah.
[04:00] <lifeless> invoked by
[04:00] <lifeless> try:
[04:00] <lifeless> foo
[04:00] <lifeless> except:
[04:00] <lifeless> set_trace
[04:00] <jamesh> ... and now you've lost the exception from the program you're tracing
[04:00] <lifeless> jamesh: zigactly
[04:00] <lifeless> jamesh: because post_mortem is bust
[04:01] <lifeless> spiv: have you landed your fix yet?
[04:01] <spiv> No, but I may as well do that now.
[04:03] <jamesh> lifeless: I posted an updated version of the python/valgrind patch that doesn't conflict with trunk (Python 2.7).  It was mainly NEWS file and autoconf generated files that had bitrotted
[04:03] <lifeless> jamesh: awesome
[04:49] <lifeless> poolie: is there a bug for the progress ratio being clipped ?
[04:49] <lifeless> 37809/45
[04:50] <lifeless> rather than /45834
[05:01] <lifeless> poolie: ping
[05:09] <lifeless> what would  be nice, would be running a custom build of python with the packaged stdlib
[05:09] <lifeless> + site-packages
[05:31] <lifeless> spiv: ping
[05:32] <spiv> lifeless: pong
[05:32] <lifeless> is my memory faultier than usual
[05:33] <lifeless> I thought we (you and I even) fixed check to detect: text A compressed against text B that isn't actual meant to exist
[05:33] <lifeless> or isn't in the ancestry
[05:33] <poolie> lifeless: pong
[05:33] <lifeless> poolie: doesn't matter now, bombs away
[05:33] <poolie> :) ok
[05:33] <spiv> lifeless: that sounds familiar
[05:33] <lifeless> spiv: care to confirm something for me
[05:34] <lifeless> grab a repo object for bzr.dev
[05:34] <spiv> lifeless: but I can never remember the precise details of that sort of thing without looking over the code/commit log, it's just a bit too subtle too stick in my head.
[05:35] <lifeless> I have a failing fetch of a text
[05:35] <spiv> Grabbed...
[05:35] <lifeless> ok
[05:35] <lifeless> .texts.get_parent_map([('intset.py-20050717175247-81cd658f9aaa2731', 'john@arbash-meinel.com-20051219174825-3046c2b52fda89dc')])
[05:35] <lifeless> ->
[05:36] <lifeless> ...(('intset.py-20050717175247-81cd658f9aaa2731', 'robertc@robertcollins.net-20050919060519-f582f62146b0b458'),)...
[05:36] <lifeless> t =<EMAIL_ADDRESS>[05:36] <lifeless> t['intset.py-20050717175247-81cd658f9aaa2731'].revision
[05:36] <lifeless> erm
[05:36] <lifeless> t.inventory['intset.py-20050717175247-81cd658f9aaa2731'].revision
[05:36] <lifeless><EMAIL_ADDRESS>[05:37] <lifeless><EMAIL_ADDRESS>!=<EMAIL_ADDRESS>[05:38] <spiv> lifeless: yes, that's exactly what I see here.
[05:39] <lifeless> spiv: grah
[05:39] <lifeless> spiv: unless I'm reading that wrong, that means that there is delta of intset.py-20050717175247-81cd658f9aaa2731 to a text version that is probably spuriously introduced by another inventory
[05:40] <lifeless> now I need to find out why my clone operation is dropping that text, and why we are not fixing that delta up
[05:40] <spiv> That's my reading too. :(
[05:41] <lifeless> but - I started at 8, and this isn't going to be that short an investigation
[05:41] <lifeless> so, I'll look tomorrow
[05:41] <spiv> It does sound a lot like the check/reconcile issue I thought we fixed, but maybe that was a subtly different case...
[05:41] <lifeless>  /wave
[05:41] <spiv> lifeless: see you tomorrow
[05:42] <spiv> lifeless: try not to get flashes of inspiration over dinner, it'd be terrible if you solved this tonight ;)
[07:34] <vila> hi all
[08:03] <ionel_mc> is bzr supposed to work with py2.6 ?
[08:09] <Peng_> ionel_mc: Yes. More or less.
[08:09] <Peng_> ionel_mc: I don't think it's officially supported yet, but bugs are fixed whenever they're discovered.
[08:11] <ionel_mc> ah, well, i got it to build (without the c-speedups)
[08:13] <ionel_mc> speaking of that - are there any benchmarks in regard of the c-speedups ?
[10:40] <ollie> hey how can I add a dir but not its contents.
[10:40] <ollie> I am trying to do a bzr mv but I am running into already versioned problems.
[13:28] <Peng_> jelmer: ping
[13:31] <Peng_> Whoops, when you accidentally corrupt a bzr repo, don't do they same thing to your other copy of the repo...
[13:32] <Peng_> s/they/the/
[13:33] <Peng_> (Anyway, no big deal. Even if it's not recoverable, all it means is I'll waste a few MB of bandwidth pulling things again.)
[13:41] <Lo-lan-do> Is there a more proper way of testing for the existence of a shared repo than running "bzr info $path" and looking for "Shared repository" in the first line?
[13:46] <Peng_> Well, I'm sure you could do it using bzrlib.
[13:47] <Lo-lan-do> This is going to be called by a (probably) PHP script, so not until bzrlib gets PHP bindings :-)
[13:47] <Peng_> Ah.
[13:48] <Peng_> You could check for the existence of $path/.bzr/repository/shared-storage, but that's evil, and may not work on older (or newer) repos.
[13:49] <Peng_> I wasn't going to suggest a hack like that, but you're already using PHP... ;)
[13:49] <Tak> you could use xmlinfo and check for /info/location/shared_repository elements
[13:49] <Peng_> Ah, that sounds good.
[13:51] <Lo-lan-do> Isn't that overkill?
[13:51] <hno> why?
[13:51] <Lo-lan-do> Also, is that in core bzr, or is it a plugin?
[13:52] <Peng_> Lo-lan-do: xmloutput plugin
[13:52] <Peng_> Lo-lan-do: You could write a small Python script to do it using bzrlib.
[13:53]  * Tak shrug
[13:53] <Lo-lan-do> Would it be better than calling bzr info?
[13:53] <Peng_> Lo-lan-do: Would what be better than who?
[13:53] <Lo-lan-do> (I'm *very* lazy, which is a virtue for programmers :-)
[13:53] <Lo-lan-do> Writing a script with bzrlib, vs. calling bzr info.
[13:53] <Peng_> Lo-lan-do: Well, I doubt "bzr info" is intended to be scriptable. Its output format could change in the future.
[13:55] <hno> for example one change which may happen is localization, replacing all strings with native language ones. There may also be significant restructuring or even renaming of things.
[13:56] <Lo-lan-do> Okay.  I'll start with bzr info, and write a bzrlib script during (of after) the weekend, since I've been volunteered to learn some bzrlib and use it at FOSDEM.
[13:58] <Tak> is there any plan to ever make, say, a C binding to bzrlib?
[14:01] <jelmer> Peng_: hi
[14:02] <Peng_> jelmer: Good morning. :)
[14:03] <jelmer> Peng_: 'afternoon :-)
[14:03]  * jelmer is finally back in his native timezone
[14:05] <Peng_> Or that. :P
[14:12] <Peng_> Lo-lan-do: Here's a very simple script, if you want it: http://paste.pocoo.org/show/102739/
[14:13] <james_w> jelmer: hey, trying to use bzr-git and it's trying to import foreign_vcs_registry from bzr-foreign and it's not in that project, is one of them out of date?
[14:19] <Peng_> jelmer: So, um, about my ping. I have copies of lighttpd-1.4.x imported with both bzr-svn 0.4 and 0.5. I tried to pull from the 0.5 copy into the 0.4 copy, but bzr exited with "Newly created pack file ... has delta references to items not in its repository". Now "bzr check" fails with "parent_id ... not in inventory".
[14:27] <Lo-lan-do> Peng: Thanks.
[15:01] <Tak> is there a way to get bzr shell not to lock the branch it's using while it's idle?
[15:11] <Peng_> Augh, another bzr repo bites the dust...
[15:11]  * Peng_ shakes his fist at lighttpd and bzr-svn.
[15:11] <Peng_> Different error this time! :)
[15:17] <Peng_> This is killing me. If I "bzr branch" copies of A and B into a repo, and check, it's fine. If I then branch C, and check, there's an SHA-1 mismatch.
[15:17] <Peng_> If I create a new repo, and just branch C, it's fine.
[15:18] <Peng_> The upstream C is fine, but the upstream A and B are in a repo corrupt in a different way.
[15:20] <jelmer> james_w, hi
[15:20] <jelmer> james_w, do you have bzr.dev ? some bits of bzr-foreign are in bzr.dev these days
[15:20] <james_w> hey jelmer
[15:20] <james_w> jelmer: ah, that will be it
[15:22] <jelmer> Peng_: Can you reproduce this using vanilla branches created with bzr-svn 0.5.0 ?
[15:37] <Peng_> jelmer: Ehh. The whole point of the exercise is that I want my old 0.4 branches. :P
[15:38] <Peng_> I think "bzr check" goes a lot faster with a btree repo. :)
[15:38] <Peng_> ...Wait, I'm not using a btree repo here. Huh.
[15:39] <Peng_> jelmer: No, I can't reproduce it.
[15:42] <Peng_> Sigh.
[16:33] <EnCuKou> Hello.
[16:33] <EnCuKou> Is there a proper way to simulate network failures in the bzr test suite?
[16:53] <Necoro> hey guys - some months ago I moved my project from subversion from svn to bzr - unfortunatly some history was lost (450 revs => ~1/3 of total history)
[16:53] <Necoro> anyone an idea how to get this history back into my bzr branch?
[16:54] <Necoro> because I liked to play around with subversion and sometimes changed the general dir layout ... which bzr-svn seems not to handle correctly
[16:55] <Necoro> depending on the parameters I pass to bzr svnimport I get different parts of the history - but not the complete one
[16:55] <Necoro> git-svn seems to handle it quite good (everything there) - but bzr-git does not want as I want ;) ...
[16:56] <Necoro> (and the last question is of course: how to merge it into the current branch...)
[17:01] <Necoro> s/some months/one year/ ;)
[17:02] <santagada> Necoro: have you tried svn->mercurial->bzr?
[17:02] <Necoro> santagada: nope ... but I thought, that the bzr-hg plugin is quite ... outdated
[17:02] <santagada> Necoro: or merging the diferent runs of svnimport?
[17:03] <Necoro> santagada: merging won't work, because the history pieces are all disjunct
[17:03] <santagada> uhmm
[17:04] <santagada> Necoro: there are other tools to move svn to bzr isn't it?
[17:05] <Necoro> probably ... but in the end it should be possible to put my current branch on top of the old history ... so anything which produces completely differnt rev-ids won't work I assume
[17:06] <santagada> Necoro: maybe then you can cherrypick the revisions after the svnimport into this new branch
[17:07] <santagada> Necoro: but those are just ideas, I don't know svnimport
[17:08] <Necoro> jelmer: am I reading correctly? - bzr-svn needs bzr-rebase-0.4.3 ... which is not released yet?
[17:08] <Necoro> hmm - nvm ... going to use trunk
[17:15] <jelmer> Necoro, yes, that's correct
[17:15] <jelmer> Necoro, rebase is not required though
[17:16] <jelmer> Necoro, only useful if you need to run bzr svn-upgrade
[17:16] <jelmer> abentley, hi
[17:16] <Necoro> jelmer: which is what I wanted to use ;)
[17:16] <abentley> jelmer: hi
[17:16] <jelmer> abentley, Is it correct that merge looks at more than just the file id for path conflicts?
[17:17] <jelmer> abentley, I have a very obscure use case here (same file ids but no shared revision history)
[17:18] <jelmer> Necoro, is this repository public btw, and if not, what is the sort of thing that git-svn preserves but bzr-svn doesn't?
[17:18] <abentley> jelmer: I think so.
[17:19] <Necoro> jelmer: repo is public (https://svn.origo.ethz.ch/portato/) -- and the difference is quite simple: git preserves all ~650 revs, where as bzr only preserves ~250
[17:19] <Tak> bzr thinks a branch is locked by a process that no longer exists - what's the best way to force removal of this lock?
[17:19] <jelmer> Tak, bzr break-lock
[17:19] <Lo-lan-do> Tak: Cut and paste the command it gives you?
[17:20] <Necoro> jelmer: because at some time I moved the whole directory structure up one level (i.e. removed the top-level dir) -- and bzr either stops or starts here ;)
[17:21] <Tak> break-lock seems to have worked, thanks!
[17:22] <Tak> Lo-lan-do: it was telling me: "Unable to obtain lock file: [...] Held by: [me] (Process #[somedeadprocess])"
[17:23] <jelmer> Necoro, have you tried: bzr svn-import --layout trunk0 <url> ?
[17:23] <Necoro> jelmer: hmm - not yet
[17:28] <Necoro> jelmer: http://dpaste.com/116602/
[17:28] <Necoro> import worked (but seeing revno 148 it seems not to be correct) - but running svn log the error above happened
[17:37] <jelmer> Necoro, thanks, that seems to be the same issue as for which you reported a bug
[17:37] <Necoro> jelmer: oh - ok
[17:38] <jelmer> Necoro, (svn-upgrade is pointless on a freshly cloned branch btw)
[17:40] <Necoro> jelmer: it is not freshly cloned -- it is the one cloned about a year ago
[17:40] <Necoro> wanted to upgrade the revision-ids so it could merge ;) (given that there is something to merge with ^^)
[17:40] <jelmer> ah, ok :-)
[17:42] <Necoro> in theory it should be ease ... here I have the revisions i+1..HEAD and there I have 1..i ... now I just need to glue them together ;)
[17:43] <jelmer> Necoro, I'm trying to figure out what the issue is
[17:47] <jelmer> abentley, it looks like it will just give path conflicts but after I resolved that it seems to handle things just fine \o/
[18:15] <Necoro> so ... what would work is to convince rebase, that it should rebase branch B on top of A - even if they do not share a common ancestor
[18:16] <Necoro> (because HEAD(A) = BOTTOM(B)-1) ... but can't find a way to do so
[18:19] <jelmer> Necoro, why would you need to rebase?
[18:19] <Necoro> because I want to join branches A and B
[18:19] <santagada> I still don't understand why a merge would not solve your problem... but I'm new with bzr
[18:20] <Necoro> santagada: in a merge, I would have all my history somewhere in a branch ;) - and not in the mainline
[18:22] <santagada> Necoro: I think you have to somehow tell bzr that B is a checkout of A, and all of B revisions should be replayed on A
[18:22] <Necoro> santagada: yap
[18:22] <santagada> Necoro: maybe rebase could do this, but I think there is probably a simpler way
[18:23] <Necoro> well ... "replay revisions" is exactly what the purpose of rebase is
[18:23] <Necoro> ;)
[18:23] <santagada> Necoro: also the checkout and stacked branch are similar
[18:24] <jelmer> Necoro, but why rebasing without common history?
[18:25] <Necoro> jelmer: the history is common ... branch B starts right after branch A ends
[18:25] <santagada> jelmer: each of those branches are the result of diferent runs of svnimport
[18:25] <jelmer> Necoro, and git-svn imports this correctly?
[18:25] <jelmer> Necoro, in that case, it really is an issue with bzr-svn
[18:26] <Necoro> jelmer: git-svn seems to just have not tried to split the svn-repo up in branch and tags etc, but just see it as ONE branch ;)
[18:26] <jelmer> Necoro, ahh
[18:26] <Necoro> (or I have just configured it wrongly ^^)
[18:27] <jelmer> Necoro, stitching the branches together this way won't work well with rebase though, as the file ids will be different
[18:29] <jelmer> Necoro, bzr-svn can import like git-svn does, as a single branch, but you probably wouldn't want that..
[18:33] <Necoro> jelmer: so - I just did a "bzr svnimport --layout=root" and then an "bzr split" ...
[18:34] <jelmer> Necoro, right, that's how to do that..
[18:34] <jelmer> Necoro, that will work, but e.g. won't preserve tags as bzr tags and won't share history with other branches in the repo (as there's only one branch created)
[18:35] <Necoro> tags can be added later on by hand ;) - and other branches are just ... well not existing/important
[18:36] <Necoro> the project is not this big
[18:36] <Necoro> jelmer: btw: this time, the KeyError did not occur
[18:37] <jelmer> Necoro, no, as bzr-svn would be ignoring all svk data
[18:37] <jelmer> since there's no svk:merge properties set on the repository root
[18:37] <jelmer> Necoro, is this a one-time import, or are you going to push back to svn?
[18:37] <Necoro> one-time
[18:37] <Necoro> just want to re-add history
[18:41] <Necoro> ok - so I'll wait until this svn-upgrade bug is fixed. then I should be able to upgrade my current trunk and rebase it onto the svn-stuff
[18:45] <jbalint> hi
[18:46] <jbalint> i've posted a question regarding file ids i need to reconcile, if anybody has any input it would be appreciated: https://answers.launchpad.net/bzr/+question/58337
[18:48] <jelmer> jbalint: those two files were added indepedently in trunk and branches/branch_5_1 ?
[18:49] <jbalint> jelmer: no, it was a migration from an svn repo
[18:49] <jelmer> jbalint, I mean in the svn repo
[18:49] <jbalint> jelmer: i'm guessing it was a standard svn 'copy', i can take a peak. do you know how it would be indicated?
[18:50] <jelmer> jbalint: the entry in the "svn log -v" for the second revision (6636) would tell
[18:52] <alf> Hello, is there a document/mail that describes what are the future plans for bzr? I keep reading about 'brisbane-core' but I can't figure out exactly what this is going to be like.
[18:54] <jelmer> alf: lp:~bzr/bzr/brisbane-core
[18:54] <jelmer> is where it lives, I think the commit log may be some indication
[18:54] <jelmer> I don't think there's a broad roadmap
[18:54] <jelmer> at least not aware of one
[18:54] <jbalint> jelmer: yeah, looks like some stuff was moved around at that rev
[18:55] <jbalint> jelmer: everything moved from /x/<whatever> to just /<whatever>
[18:57] <jelmer> jbalint, but what sort of operations ? Just "A" without "(from: /...)" ?
[18:58] <jbalint> jelmer: no, it shows "Copied from path" (i'm using tortoise svn)
[18:59] <jelmer> jbalint: For those individual files or the branch ?
[18:59] <jelmer> jbalint, It needs to be from the branch for bzr-svn to create matching file ids, as bzr doesn't support copies yet
[19:00] <jbalint> jelmer: what do you mean "from the branch" this is just a re-organization inside the branch http://www.improvedideas.com/files/svn_mv.PNG
[19:01] <jelmer> jbalint, ahh
[19:01] <jbalint> hold on a second, rev 6636 is interesting
[19:02] <jelmer> jbalint, I mean, only copies of the branch root will preserve the file id of any affected file
[19:02] <jelmer> in all other situations the file id will change
[19:02] <jbalint> jelmer: does svn have this same concept?
[19:02] <jelmer> jbalint: svn doesn't have the concept of file ids that have to be unique
[19:02] <jelmer> jbalint, and it supports copies, whereas bzr does not
[19:03] <jbalint> jelmer: so here is 6636, http://www.improvedideas.com/files/svn_mv2.PNG it looks like the merge into trunk re-arranged all the files
[19:05] <jbalint> jelmer: this was all done with the svnmerge python script at the time. but we're not even using svn anymore, so i need to figure out some way to be able to merge again - with bzr
[19:05] <Necoro> jelmer: ok - invoking git-svn in the correct way, it actually produced what I was looking for ;) - though it took waaaay longer than with bzr - and it checked out the whole repo like ... 50 times
[19:05] <jelmer> jbalint, there isn't much that can be done about this until bzr gets support for tracking copies
[19:05] <jelmer> Necoro, what is it you're looking for exactly?
[19:06] <jelmer> jbalint, for the current situation, the only thing you can do really is to fix the conflicts
[19:06] <Necoro> jelmer: checking out the svn-repo and deal correctly with the "one-level-up"-move and thus return the complete history
[19:07] <Necoro> (the same I got with bzr-svn-import --layout=root + bzr-split)
[19:07] <jbalint> jelmer: i'm willing to do that, but afaict i won't work because bzr wont merge files with different file ids
[19:07] <jelmer> Necoro, but that's importing the svn repository as a single branch and then just throwing some stuff out?
[19:08] <jbalint> jelmer: i get a contents conflict on every file
[19:08] <jelmer> jbalint, yeah, that's true. there's no way to associate more than one file id with a file as far as I know, but you may want to ask on the list.
[19:08] <jbalint> jelmer: ok. thanks for the info!
[19:09] <Necoro> jelmer: true - git does it in a smarter way - there I really only have the trunk-data in the end -- though the complete one
[19:09] <jelmer> Necoro, so where does bzr cut off history?
[19:09] <jelmer> Necoro, since if there's enough info for git-svn, there should be enough for bzr-svn (which already tries to follow branch history completley)
[19:10] <santagada> I think the problem was that Necoro moved the trunk dir around
[19:10] <jelmer> santagada, that's not a problem
[19:10] <jelmer> santagada, at least not with bzr-svn >= 0.5.0
[19:10] <Necoro> upto revision X I had everything in /local/trunk - after rev X in /trunk ... and bzr splits at that X (i.e. I either get: 1..X-1 or X..HEAD)
[19:11] <Necoro> perhaps the SVK things mixed confuses bzr-svn ... and git-svn just ignores them ;P
[19:11] <jelmer> Necoro, what svn revision is that?
[19:11] <Necoro> X = 454
[19:36] <sohail> hey, I'm trying to rollback a specific set of checkins that occurred as a result of a branch merge
[19:36] <sohail> so I'm trying bzr merge -r 1020.2.1010..1020.2.1008 .
[19:36] <sohail> bzr claims to do stuff, even has a conflict, but then bzr st -v says nothing after I fix the conflict :-/
[19:36] <sohail> oh duh, I already rolled it out
[19:37]  * sohail is a dumbass
[20:42] <lifeless> moin
[20:43] <kfogel> Is loggerhead trunk generally stable?  (Production use okay for those willing to jump in and fix something occasionally?)
[20:44] <lifeless> kfogel: we run it on launchpad
[20:44] <lifeless> well nearly
[20:45] <lifeless> uhm, I wouldn't have a loggerhead trunk on auto-update, in  production use
[20:45] <lifeless> but I would run trunk, and test updates
[20:45] <kfogel> lifeless: thanks
[20:45] <mwhudson> yeah, launchpad generally runs near-trunk
[20:46] <kfogel> not sure what "on auto-update" means -- is that a feature of loggerhead, or do you just mean "don't have a cron job updating it, do it manually and be prepared to roll back"?
[20:46] <mwhudson> though for some reason my attempt to get it updated in time for 2.2.1 failed :/
[20:49] <speakman> hi folks, I'm stuck with ModelForms in forms.py when importing a model from models.py it just says "ImportError: cannot import name MyModel". But there IS a class MyModel(models.Model): in models.py. Anyone encountered this?
[20:49] <speakman> gosh wrong window
[20:50] <MattCampbell> I thought that sounded more like Django than bzr.
[20:50] <speakman> :D
[20:50] <lifeless> kfogel: the latter
[20:50] <speakman> (but it mostly sounds like an python issue..)
[20:51] <mwhudson> speakman: import models; print models.__file__ -- check you're importing what you think you are
[20:51]  * mwhudson reigns in his helpfulness again
[20:53] <kfogel> lifeless: gotcha
[20:56] <lifeless> kfogel: unless your cron job software is spelt 'sysadmin'
[20:56] <kfogel> lifeless: my cron job is spelt "staging server", actually
[21:13] <sohail> is there an equivalent to svn up -r $FOO
[21:14] <sohail> oh bzr revert
[21:45] <sohail> kfogel, are you the kfogel from svn
[21:45] <Lo-lan-do> ...and from CVS, I think.
[21:46] <Lo-lan-do> (Well, at least from the book, I assume)
[21:47] <sohail> kewl
[21:47] <kfogel> sohail: same person, yup
[21:47] <sohail> is there any abbreviation for bzr branch ~/bzr/code/master ~/bzr/code/foo
[21:47] <sohail> kfogel, good to know I'm on the right track ;-)
[21:47] <kfogel> sohail: cd ~/bzr/code; bzr branch master foo
[21:47] <kfogel> :-)
[21:47] <sohail> kfogel, doh
[21:48] <sohail> problem is on the other machine I have to type bzr branch bzr+ssh://blahblahblah
[21:49] <kfogel> sohail: well, bzr can remember source/dest branches once you've made a new branch, for example, see the --remember option to 'bzr push'
[21:50] <kfogel> (and to 'bzr merge', and perhaps other commands as well)
[21:50] <lifeless> sohail: we plan to make more use of relative paths
[21:51] <spiv> There are also some aliases, like ":parent".
[21:51] <sohail> hm, an alias sounds about right
[21:51] <Lo-lan-do> Also the bookmarks plugin.
[21:53] <Necoro> or a (bash)function if you often access the same location: e.g: bb() { branch="blah/blah/the_branch"; bzr branch bzr+ssh://${branch} bzr+ssh://$(dirname $branch)/$1 }
[21:55] <Necoro> (where "bb blubb" is equiv. with: bzr branch bzr+ssh://blah/blah/the_branch bzr+ssh://blah/blah/blubb )
[21:55] <sohail> yep, was hoping to avoid a bash script since "the other machine" is windows
[21:56] <Necoro> oh
[22:00] <igc> morning
[22:06] <mwhudson> kfogel: how is savannah starting loggerhead?
[22:11] <kfogel> mwhudson: I don't know, but feel free to post in the bug and ask Sylvain.  (I'm happy to do it if you want, but it might make sense to remove the intermediary.)
[22:12] <kfogel> mwhudson: I'm installing it locally right now to see if I can reproduce
[22:12] <mwhudson> kfogel: ok, i posted to the bug
[22:12] <kfogel> thanks
[22:13] <kfogel> mwhudson: hmmm. and now I'm reading through the loggerhead README in trunk and see this:
[22:13] <kfogel> 3) Paste Deploy  (optional, needed when proxying through Apache)
[22:13] <kfogel>    on Ubuntu package `sudo apt-get install python-pastedeploy`
[22:13] <kfogel>    or use `easy_install PasteDeploy`
[22:13] <kfogel> wonder if there's any connection
[22:14] <mwhudson> kfogel: see my comment in the report :)
[22:14] <kfogel> mwhudson: hah
[22:14] <mwhudson> maybe i should just paste in a known working copy of prefixmiddleware into loggerhead and be done with this
[22:14] <kfogel> mwhudson: I hadn't yet read your comment (because I thought you'd posted to the Savannah bug, not the lp one)
[22:14] <mwhudson> kfogel: ah
[22:15] <kfogel> mwhudson: I'm copynig over, np
[22:15] <kfogel> mwhudson: I'm not sure it makes sense to try to formally connect the savannah bug to lp
[22:15] <kfogel> if that can even be done
[22:16] <mwhudson> i think it can be
[22:16] <mwhudson> but well
[22:16] <mwhudson> effort < payoff
[22:16] <kfogel> exactly
[22:16] <mwhudson> i really really hate the way urls are generated in loggerhead btw
[22:17] <mwhudson> but i hate this in everything to do with the web i've ever done, so...
[22:18] <kfogel> mwhudson: hunh.  Really?  Maybe I haven't worked in web space enough; URL-generation never struck me as a particularly ugly process.  Now, communicating streamy data over HTTP is another matter...
[22:18] <mwhudson> kfogel: loggerhead is probably worse than average
[22:18] <mwhudson> but there always seems to be repetition, at least
[22:19] <kfogel> mwhudson: oh.  Well, it's working at least!  http://localhost:8080/changes is serving my (of course) loggerhead-trunk branch
[22:19] <mwhudson> kfogel: cool
[22:19] <kfogel> never done anything with mod_proxy though, so not sure if this next step will work.  let's see
[22:21] <mwhudson> so where paste deploy comes into this is that when proxying
[22:21] <mwhudson> apache sends an x-http-forwarded-for header or something like that
[22:22] <mwhudson> paste deploy has some magic that looks at this and tweaks the environ so that the application thinks it's serving requests for http://external-host/ not http://localhost:8080/
[22:23] <mwhudson> but if paste deploy isn't installed (or you have a buggy version, though i can't remember if that's actually happened) this doesn't happen
[22:23] <mwhudson> i should probably tweak serve-branches to complain if paste.deploy is not installed _and_ HTTP_X_FORWARDED_SERVER is set in the environment
[22:24] <kfogel> mwhudson: that would be a good idea, yeah
[22:37]  * mwhudson isn't sure the new branching instructions on every loggerhead page are especially attractive :/
[22:37] <lifeless> kfogel: both url generation and stream data are fugly fugly fugly fugly
[22:38] <lifeless> kfogel: url's are a single namespace, but we want OLAP spaces basically
[22:38] <kfogel> lifeless: OLAP?
[22:38] <lifeless> kfogel: and also want it to be easy to type in
[22:38] <lifeless> kfogel: online analytics of the branch
[22:38] <mwhudson> certainly >1 dimensional urls would make life easier
[22:38] <kfogel> s/easy to type in/short/
[22:38] <kfogel> ?
[22:39] <RomD> hi, I tried to download the latest version of this project: https://launchpad.net/~poppler-python
[22:39] <RomD> but I'm getting this error:
[22:39] <RomD>  bzr branch lp:poppler-python
[22:39] <RomD> bzr: ERROR: Invalid url supplied to transport: "lp:poppler-python": Series trunk on poppler-python has no branch associated with it
[22:39] <kfogel> That is, length is a primary driver?
[22:39] <lifeless> kfogel: time is one dimension, content another, and don't even think about metadata analysis like searching/authors/bugs<->changes etc
[22:39] <kfogel> ugh
[22:39] <kfogel> yeah
[22:39] <lifeless> kfogel: I8U66%rr# is short but not easy
[22:39] <RomD> is there any way to get the source code?
[22:39]  * mwhudson watches bzr-avahi get excited when he runs loggerhead's tests
[22:39] <lifeless> RomD: sure is, head to launchpad and click on 'code'
[22:39] <mwhudson> i guess i should be using bzrlib.tests.TestCase...
[22:39] <lifeless> RomD: it should have a listing of branches there
[22:40] <spiv> mwhudson: yeah
[22:41] <spiv> mwhudson: also, you might end up getting prompted for GPG keys and the like...
[22:41] <RomD> ah thanks lifeless, didn't see that it shows the exact name there. forgot the "~" in front
[22:41] <mwhudson> spiv: hm yeah, seahorse rescues me from that i guess
[22:42] <mwhudson> kfogel: ok, i committed that fix
[22:43] <kfogel> mwhudson: that was *fast*
[22:43] <kfogel> mwhudson: does the issue update automatically?
[22:43] <kfogel> mwhudson: hmmm.  apparently not
[22:43] <mwhudson> kfogel: well it doesn't really address the issue head-on
[22:44] <kfogel> ?
[22:44] <mwhudson> it just makes one possible cause slap you in the face rather than generate bogus links
[22:44] <kfogel> oh
[22:44] <kfogel> that fix
[22:44] <kfogel> well, that's still good
 i should probably tweak serve-branches to complain if paste.deploy is not installed _and_ HTTP_X_FORWARDED_SERVER is set in the environment
[22:44] <kfogel> it'll be much more apparent that one's setup is bogus then
[22:44] <kfogel> right
[22:44] <mwhudson> ^^ that's the fix i was talking about
[22:47] <kfogel> mwhudson: noted in the issue
[22:48] <mwhudson> kfogel: ta
[23:15] <jml> I have a branch that merged into my project's trunk a long time ago
[23:15] <jml> how would I find out what revno of trunk the merge took place?
[23:19] <lifeless> jml: bzr missing trunk
[23:20] <jml> lifeless: which of the several dozen revisions is the answer?
[23:20] <lifeless> jml: the lowest number - 1
[23:21] <spiv> Someone should write a when-merged plugin...
[23:44] <igc> bbl - errand to run