[00:07] beuno: ping - bzr session now [00:07] beuno: in 'bragi' [00:15] hey, what versions of python does bzr 1.10 "officially" support? [00:16] rocky, 2.4 and 2.5 [00:16] is 1.11 aiming for 2.6 support? (officially) [00:18] rocky, I don't think we'll be officially supporting 2.6 very soon. Supporting 3 versions of python sounds a bit hell-ish [00:19] it does, but i would hope for a shift to 2.5/2.6 up from 2.4/2.5 [00:22] 2.6 should be fine with 1.10 [00:22] rocky: 2.4 going is more a factor of distro release schedules and company migration needs than anything else [00:32] lifeless: i asked about "official" because when i tried 1.9 on py2.6 (which "should" work) i found several plugins i used didn't work with 2.6 [00:33] anyways, bzr rocks, keep up the good work ;) [00:33] well, plugins are different from bzr core of course :-) [00:35] apparently bzr-svn requires >= python 2.5 these days :-/ [00:36] part of why i'm asking is because i'm considering integrating bzr into my cluemapper suite (trac integration) and i require >= py2.5 and would like to update it to 2.6 at some point [00:36] I don't think anybody is opposed to 2.6 support, but it may be useful to file bugs if you find things don't work with 2.6 yet [00:44] rocky: plugins - file bugs on them [00:45] right [00:45] rocky: I mean, I don't *have* python2.6 available on my machine, I can't really fix bugs:) [00:45] everyone can have py2.6 available on their machine :) [00:45] unless you're running msdos or something ;) [00:46] $ apt-cache search python2.6 [00:47] wget Python-2.6.1.tar.bz2 && tar jxf Python-2.6.1.tar.bz2 && cd Python-2.6.1 && ./configure --prefix=$HOME/python2.6 && make && make install [00:47] Oogh. [00:47] at least that's what i just did on my 3 ubuntu desktops :) [00:48] rocky: yeah, 'no'. [00:48] :) [00:49] lifeless: i guess my line was a tad bit longer than yours ;) [00:56] rocky: :) === lv is now known as Lutin42 [00:59] Hi! I have a bzr repository. Today, I copied the whole folder onto a USB key and from an other computer, changed some files in it. I did not do any bzr operations. Tonight, I copied the folder back to the first computer in a different folder. Now, bzr status tells me that all the file have been modified (which is not true). [00:59] Any reason this happens? [00:59] Any way to fix it? [01:00] have you tried bzr revert? [01:00] Lutin42, well, the files probably changed properties like owner and such [01:00] bzr revert will throw away all those changes [01:00] so make sure that you don't have anything you don't want to loose [01:00] hmmm... I can do this. But I'd like to figure out what happened [01:01] I will look at the property [01:01] Is time relevant? [01:03] jelmer: are you aware of a problem with bzr 1.10 and bzr-svn 0.4.16 in create_auth_baton? [01:04] jfroy|work, no [01:04] I'm getting a TypeError exception from that method (auth.py:181) [01:04] "Auth providers should be list" [01:05] Any ideas? [01:07] jfroy|work, no, sorry. Is providers actually a list? [01:07] totally should be [01:09] ok; the permissions have been messed up [01:10] Lutin42: time isn't relevant [01:10] Lutin42: I would guess the execute bit was changed or something [01:10] Lutin42: what does 'bzr diff' show? [01:10] Lutin42: and can you pastebin the output of status, for justa few files, so we can see it [01:11] I fixed the permission of one of the file and it does not show any more in the status [01:11] so all is good :) [01:13] jelmer: nm must have been a bad build [01:13] actually that's exactly what happened [01:13] your Makefile is not robust enough [01:14] patches welcome :-) [01:14] the Makefile is just a convenience wrapper around setup.py though, not intended as the primary build mechanism [01:14] correct [01:15] the problem is that it uses which to find Python and bzr [01:15] But on the system I was using, the default python is not the same as the python used by bzr. [01:15] All kinds of bad things ensued. [01:15] Ideally it should parse the path returned by bzr --version [01:16] (which is what my patch will do) [02:37] beuno: fwiw, I'm not sure the Loggerhead changes improve memory usage for me much. [02:38] beuno: It *might* be a bit better. It's at 120 MB right now, but it usually jumps to 150 instead. [02:40] Peng_, 120 vs 150? [02:40] the major win should be in total usage [02:40] it shouldn't keep on scaling [02:41] What do you mean? [02:42] it leaks memory for us [02:42] until it crashes [02:42] on large trees [02:42] brb [02:42] eep === Mario_ is now known as pygi === fta is now known as fta_out === ozzloy_ is now known as ozzloy === sven is now known as sven|away [11:58] hello, does bzr have commands that works like git log -p (producing both, changelogs and diffs at the same time - ex http://pld.pastebin.com/f1c76c250) ? === jszakmeister is now known as jszakmeister|awa [13:21] beuno: Since the latest Loggerhead trunk stuff, mem usage has actually gotten worse for me. But the workload is a bit different than usual, so it might be expected. [13:22] * Peng_ goes back to being away [13:25] mr [14:03] s/expected/because of that/ [14:03] * Peng_ goes back to being away again. :P === Mario_ is now known as pygi [14:59] hmm, looks like there is no such feature in bzr :-( most commonly used command by me for git repos [15:02] on the other hand http://wiki.frugalware.org/Git_setup says "not possible without plugins" so maybe there is a plugin for that already [15:07] so is there a plugin that does this? https://lists.ubuntu.com/archives/bazaar/2008q1/038202.html [15:50] matkor: https://bugs.launchpad.net/bzr/+bug/202331 and https://bugs.launchpad.net/bugs/227335 [15:50] Launchpad bug 202331 in bzr "log should be able to show diffs as well" [Medium,Confirmed] [15:51] arekm: he he, you are not the only one [to cite GnR ;) ] === Mario_ is now known as pygi [15:53] Peng_, that's not very good news :( [15:53] what version of bzr are you running? [16:11] beuno: bzr.dev. [16:11] Hmm, Loggerhead just recently started loading plugins. I wonder if that could be involved? [16:12] I have no idea /how/, but.. [16:22] Peng_, ah, right. That patch probably shouldn't of gotten in [16:22] it does load plugins [16:22] actually, I'm not sure if that's such a bad thing... [17:54] hi [18:36] What's the difference between bzr get and bzr branch? [18:37] Flimm: get is just an alias for branch [18:38] OK, thanks [18:59] hello. i messed up my branch and committed a huge file. i want to remove any history of this commit [18:59] because now my .bzr is way too big [18:59] how do i do this? [19:02] you could uncommit [19:02] and then clone the branch [19:02] the new one will not contain the uncommited revision [19:02] it's more complicated if you're using a shared repo [19:03] good plan [19:03] nope not [19:04] Even if you are using a shared repo, it's not that complicated. [19:05] how would you do it? reconfigure --standalone on each branch using it, recreate the shared repo, and reconfigure --shared? [19:06] or is there a command to completly wipe out the revision? [19:06] bpierre: Create a new repo and a branch inside it, "bzr heads" in the original repo, pull each one into the new repo, then swap the repos out. [19:06] ("bzr heads" comes from bzrtools.) [19:07] Peng_: you hang out here too :) [19:07] ok [19:07] derekS: Hi. :) [19:09] i am considering putting my bzr repo in something like Dropbox. its only me who uses it, any comments for or against it? [19:09] i am thinking it might be easier then pushing/pulling on 2 computers [19:09] jelmer, lifeless: you rock ;) [19:10] derekS: Pushing/pulling/merging is not that hard. [19:10] mmm [19:10] Peng_: I just tried heads on one of my repo, and I'm not seeing the head of each branch using it [19:10] Peng_: i know ;) [19:16] pygi: thanks? :) [19:17] lifeless, why the question mark? :p [19:18] hmm, i uncommitted, and did a clone, the new folder is bigger than the old :) [19:19] :P [19:19] I tested it and it worked for me [19:19] lifeless, you can probably expect our TOC next week, so you can do a quick check so we could create final revision of it :) [19:20] derekS: same repository formats? [19:24] bpierre: yeah, just realize i might have had to do 2 uncommits === BasicPRO is now known as BasicOSX [19:34] pygi: wasn't sure what you where thanking me for :) [19:34] lifeless, ah, now you know then :p [20:33] jml: ping me when you are up please [20:35] Peng_, so, memory usage is still up for you? [20:42] so when you push a directory, it just copies the .bzr? [20:44] if you push to a remote server, yes [20:45] so what kind of compression is used? my .bzr folder is significantly smaller than the contents of the repo [20:46] it stores only the changes (not the full history), and the data are then gzipped [20:46] oh wait [20:46] by 'repo' you mean actual bzr repository, or your working tree [20:47] bzr repo [20:47] because the working tree has actual data [20:47] the remote push doesn't [20:47] well, it might be using a shared repository [20:48] what's inside the .bzr folder on the server? [20:48] just the .bzr [20:48] I mean inside it [20:49] README branch branch-format branch-lock repository [20:49] ah, then it contains the repository as well [20:50] means all the data gzipped? [20:50] delta-compressed and gzipped [20:50] thanks :) [23:04] Hi. I'm having trouble with the SVN plugin on bzr-1.9 on windows. I've ran the setup, but things like "bzr version" now say: [23:04] Unable to load bzr-svn extensions - did you build it? [23:04] cannot import name client [23:04] Does anyone know how to fix this? [23:04] CyberSnooP, how did you run the setup? [23:05] Downloaded bzr-setup-1.9.exe and kept the defaults [23:05] that should include bzr-svn I think [23:05] Well, the plugin is there and bzr tries to load it indeed [23:06] but somehow it fails to load with the above error [23:06] The only clue seems to be: "cannot import name client". So probably I'm missing a dependancy, but I couldn't find which one, or how to fix it [23:11] CyberSnooP, that file is part of bzr-svn [23:11] CyberSnooP, it is built when you run setup.py [23:11] CyberSnooP, how did you install bzr-svn? [23:12] CyberSnooP, also, I think there was an updated version of the bzr 1.9 setup that fixed some issues, it may fix stuff in bzr-svn as well [23:12] I didn't install bzr-svn manually, but I've only used the bzr-setup-1.9 which should have bzr-svn bundled [23:13] CyberSnooP, in that case, it sounds to me like a broken setup [23:47] jelmer: any chance of that pack code :)? sorry to bug but im blocked on it atm.