[00:10] eelik: there is no schedule for either. But you can just use a tree-less repository and a single working tree which you run 'bzr switch' to switch between. [00:11] I know, but it's clumsy [00:11] can't compete with git [00:39] eelik: true; you're welcome to work on reducing the clumsiness [00:39] (or on those other proposals) [00:42] jelmer: poke? [00:43] jelmer: bzr st on git branches seems wonky, it doesn't report modified files that haven't been added to the index [00:43] mathrick, hi [00:43] mathrick, you need to "git add" them again to see the changes [00:43] yeah, I know, but I was expecting bzr st to tell me about the changes [00:45] mathrick, you probably just want a bzr working tree in that case [00:46] jelmer: It would be nice if 'bzr st' behaved as bzr does here. [00:46] jelmer: that is, to refresh the index [00:46] jelmer: possible, I use bzr-git as more bearable git for working on code with git upstream; what's the least painful setup in this case? [00:46] lifeless: sure, but somebody would have to code that up [00:46] lifeless: it's nontrivial since we can't really trust the index [00:47] lifeless, but we also would like to avoid writing to the index on read operations [00:47] jelmer: the index is ~= dirstate, and we write to the dirstate on read operations. [00:50] lifeless: but that's just the stat cache though, isn't it? [00:51] lifeless, modifying the actual contents of the index seems more dubious to me [00:51] jelmer: we don't version or unversion things [00:51] jelmer: but I'm not suggesting we do that here either. [00:52] lifeless: not versioning/unversioning a particular file, but versioning a particular revision of a fil [00:52] "git status" would give different output when run after "bzr status" [00:53] jelmer: yes, it would match whats on disk more ;) [00:53] lifeless: :-) [00:53] jelmer: you will get complaints either way ;) [00:54] lifeless: Yes, and it is the way it is because it doesn't require any effort on my part ;-) [00:54] *extra [00:55] jelmer: the other way is more useful for the bzr-git user though [00:55] I think it's fairly safe to assume that people who use bzr-git are expecting more bzr-like behaviour [00:56] jelmer: anyway, how hard will it be to push/send patches upstream if I switch to a bzr tree instead of operating on the git tree directly? [00:57] mathrick: it wouldn't be any harder/less hard than using a git repository locally I think [00:57] mathrick: The index won't ever be a 1-to-1 match with a bzr working tree [00:58] I think the best solution would be to keep a separate sha1-cache independent of the git index [00:58] and use that for bzr-git [01:04] spiv: [01:04] https://code.edge.launchpad.net/~spiv/testtools/test-parameterisation - might want to finish, or delete. [01:13] \o/ bzr selftest selftest working with testtools test runner === jfroy_ is now known as jfroy [10:17] An autopack gave me an "inconsistent details in skipped record" message. "bzr pack" did not. What does that mean, exactly? [10:18] inconsistent details in skipped record: ('monty@askmonty.org-20091125073628-7fekfnr2hmkbjos1',) ('660427 67263 0 319', StaticTuple(StaticTuple(StaticTuple('monty@mysql.com-20091116153408-azpb6hq1zfp1kpvv',), StaticTuple('monty@askmonty.org-20091107103419-28zpi3oyre6kaf2l',)),)) ('1545757 266 0 319', ([('monty@mysql.com-20091116153408-azpb6hq1zfp1kpvv',), ('monty@askmonty.org-20091107103419-28zpi3oyre6kaf2l',)],)) [10:37] hi, howcome there is no Arch Linux here: http://bazaar-vcs.org/Download ? [10:48] How do I best install qbzr and bzr-explorer in arch linux? [10:51] hm, bzr seems very ubuntu-centric [10:51] not really [10:51] * fullermd looks at all the computers around him with bzr installed, and notes that none of them run ubuntu :p [10:52] just install them from source [10:52] or you could be the lucky arch user who packages them first :) [10:52] well, they are packaged in the aur, but the seem to be out-of-date [15:12] Hi, I just downloaded qbzr (I want to install bzr-explorer and it said to install qbzr first). What do I do with the extracted tarball? It doesn't have any INSTALL, and the README.txt doesn't say anything about installing :( [15:34] christoph3141: python setup.py install [15:57] Glenjamin: thanks! [16:01] I followed the instructions at http://doc.bazaar-vcs.org/explorer/en/install-linux.html, but running "bzr explorer" says "bzr: ERROR: unknown command "explorer"" [16:01] What do I do? [16:10] oh, it works now, I was in the wrong directory while running the command [16:46] lol [16:46] bzr thinks my Mac OS X box is a weird windows hybrid! [16:46] Bazaar (bzr) 2.1.0b3 [16:46] Python interpreter: /usr/bin/python26.dll 2.6.1 [18:08] hi. would anyone have an idea how to get started setting up loggerhead for IIS7? [18:08] python is installed and running fine, but i'm lost from there on [19:03] I have a branch derived from a tailor-generated branch. I know want to move it over to a branch created via Launchpad's vcs-import. How would I do that? There's no common ancestor. [19:14] hum.. does not seem to be possible (easily).. https://bugs.launchpad.net/bzr/+bug/318620 [19:14] Launchpad bug 318620 in bzr "When merging two branches without common ancestry, Bazaar provides no means to map file IDs" [Undecided,Confirmed] [19:15] I guess I'll do a merge with "-r", manually compare the directories and then commit.. [20:28] moin [20:34] hi [20:35] where can i get the special SSH for Bazaar? [20:38] what special SSH? [20:40] meoblast001, AFAIK all the packages now install or cause to be installed sufficient SSH for it to work. [20:41] ? [20:41] lifeless: the one that lets 2 people work on the same project [20:42] without being in the same UNIX group [20:42] meoblast001: do you mean the launchpad ssh server? [20:42] yup [20:42] meoblast001: because that requires the same UNIX group, by having /everyone/ be in the same unix group and doing its own checking first. [20:43] meoblast001: in the launchpad source code. [20:43] i tried downloading launchpad and it tried to screw with my system [20:43] meoblast001: yes, it will be a lot of work to reuse that code. [20:43] :/ [20:43] does every version control system have this problem :/ [20:43] yes. [20:44] are there any other SSH servers that can fix my problem? [20:44] you haven't described your problem. [20:44] so I can't answer that question. [20:44] i have someone who wants to help me on a project i'm doing, this is a personal project so i'm using my Bazaar server [20:45] but i don't want to put him in the same group as me on my server [20:45] well, i don't want him to ahve access to everything i have access to [20:45] make a new group? [20:45] but then he can't access my code for this project [20:46] chown the project to that new group ? [20:46] then i can't access it [20:46] put yourselfin the group too [20:46] then he can access all my projects [20:47] how? [20:47] they are in a different group [20:47] wait, can a user be in more than 1 group? [20:47] of course [20:47] *gasp* [20:47] learn something new everday i guess [20:47] so i just have a group for each project then? [20:49] something like that, yes. [20:50] you may want to do some reason on this under general unix sysadmin knowledge. [20:50] do you know of any better solutions? [20:50] i don't like to put my personal projects on launchpad because they're really not official, generally just things i make when i'm bored [20:51] there's always +junk [20:51] +junk? [21:00] you can push stuff to ~yourid/+junk/ [21:00] like this https://code.launchpad.net/~gutworth/+junk/mod2format [21:00] what if i want it on my server though >.< [21:00] anyways, i'm a hacker, i enjoy experimenting ;) [22:40] hi. does anyone have any suggestions how to use Loggerhead on IIS7? [22:41] apparently theres some isapi thing [22:41] if you mail the like awilkins, who does that, may see. [22:41] he may have blogged about it already in fact. [22:41] oh hmm, awilkins does the smart server on windows... but I wouldn't be surprised if he has loggerhead too [22:42] lifeless: ah right, i see [22:42] any chance of getting it on a shared server you think? [22:42] (virtual server i guess) [22:42] I don't know what you mean [22:43] lifeless: well my point is that i don't have access to IIS7 directly [22:43] only a control panel - so i can't install arbitrary modules [22:44] oh. well I've got no idea there sorry. [22:45] no worries [22:46] lifeless: loggerhead isn't purely web-based, right? [22:46] so it's going to require some hackery [22:48] Noldorin: its a python wsgi web server [22:48] you should be able to run it up, with some glue code, in any wsgi container [22:49] or proxy to it from any proxy capable webserver (such as apache) [22:49] bzr-gtk makes nautilus crash in debian sid. anyone know a fix? [22:49] lifeless: i see. i'm not really a python coder (as you may remember), so that's probably asking for trouble [22:49] would be cool if someone else has already done it though [22:50] i guess if there's some sort of python web app equivalent to loggerhead, that would be ideal [22:51] loggerhead is a python web app [22:53] lifeless: hrrm. probably just showing my ignorance here. i'm an ASP.NET guy mainly. [22:53] and python is installed on my server as well, but i guess i'm not sure exactly what that means [22:55] http://www.python.org/dev/peps/pep-0333/ [22:55] http://code.google.com/p/isapi-wsgi/ [22:55] (just quickly googled for wsgi python and wsgi python isapi) [22:58] lifeless: yeah, guess i'll just have to ask my web admin then [22:58] thanks anyway [22:59] lifeless: oh, in case you're curious...if you remember those problems i was having with bzr via ftp on my iis server. seems upgrading to iis 7 solved it :P [23:00] Noldorin: the crazy file system stuff? [23:00] Noldorin: I'm curious if there were any other system changes made at the same time [23:00] lifeless: that's right. where we concluded the ftp server wasn't conforming to the rfc and such [23:00] so am i... [23:00] there was an upgrade to win server 2008 too [23:01] but i wouldn't know anything more [23:02] * lifeless guesses at the OS change being it. [23:03] lifeless: you think? more likely than the version of iis? [23:03] meh. once either gets completely phased out, your problem is solved anyway :P [23:04] only another 10 years :) [23:05] Noldorin: yeah, much more likely to be OS level - DFS stuff - than IIS [23:05] mm, makes sense i guess. [23:05] lifeless: probably not quite that long, but yeah :P [23:05] at least the problem is rare enough anyway [23:06] bzr-gtk makes nautilus crash in debian sid. anyone know a fix? [23:08] elli222: Did this start recently? I was using nautilus with bzr-gtk installed for quite a while without problems [23:10] nope its happened whenever i've installed it [23:10] (in debian sid) [23:12] elli222, in that case, no idea - sorry [23:13] well, what was your idea anyway? it might work regardless [23:13] in that case it wouldn't be caused by e.g. a new version of nautilus being introduced that's incompatible with bzr-gtk [23:14] it only crashes when trying to go into a directory containing SVN controlled folders. i don't have any native bzr ones. [23:14] you should be able to disable the bzr-gtk integration in nautilus, that should at least allow you to use the other bits of nautilus [23:14] elli222, does using bzr manually in those folders work? [23:14] hmm, i'll check [23:15] i assume bzr pull would be the same as svn up? [23:16] OK~ thats wrong [23:18] no, bzr up [23:19] that appeared to work [23:19] yep, it worked [23:19] can you try accessing a native bzr branch with nautilus? [23:19] you should be able to create one with 'bzr init' [23:21] that also appeared to work [23:22] yep, seems like nautilus dosen't like bzr-gtk and bzr-svn [23:24] looks like bzr-gtk has a spasm with SVN aswell [23:26] and what about e.g. "bzr log" in a svn working copy? [23:27] that works fine [23:30] hmm, that's odd [23:30] do you have any something likme nautilus-svn installed as well perhaps? [23:31] nope [23:46] hey i've got a bzr problem that i can't solve on my own [23:47] perhaps you should describe it and ask a question :) [23:48] elli222, not quite sure what's happening then [23:49] elli222: please file a bug report [23:49] elli222, you should be able to work around the problem by uninstalling either nautilus-bzr or bzr-svn if you are not using either of them [23:49] *one [23:51] http://pastebin.com/d42185bf3 [23:51] lifeless, ^ [23:51] when i try to commit i get that error message [23:53] pace_t_zulu_: run bzr break-lock lp:~jhaitas/gnome-panel/panel-layout [23:53] spiv, ty [23:54] later [23:56] * igc out for a few hours -bbl