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