[00:42] I've made some local, uncommitted changes but decided they would be better suited to be put into their own branch. Is there an easy way I can branch, keeping the local changes? [00:42] gotgenes: "bzr branch thisdir otherdir; cd ../otherdir; bzr merge --uncommitted ../thisdir" [00:43] jelmer: awesome, let me try that [00:43] if you're using checkouts, make a new branch, and 'bzr switch' the working copy to the new branch [00:43] bob2: no checkouts in this case [00:44] Or commit --local, branch, and uncommit [00:48] jelmer: Brilliant! [00:49] EnCuKou: that would also work, too. [01:04] merge --uncommitted is cool [01:15] yeah [01:27] mwhudson: did that TODO for revnocache prove interesting? [01:27] igc: yes [01:28] mwhudson: lifeless has some thoughts he'd like to share on how best to use btrees so be sure to ping him before hacking on that bit [01:28] igc: i'm hip-deep in reviewing launchpad code today though [01:29] mwhudson: np. Just making sure I didn't forget to tell you :-) [01:29] igc: ok, i saw, i cogitated, but no more than that :) === asac_ is now known as asac === spm_ is now known as spm [02:35] any ETA on working ~bzr PPA for Intrepid? [02:43] * igc lunch === timchen1` is now known as nasloc__ [04:31] lifeless: ping? [04:31] lifeless: i got a pqm failure full of lines like this: [04:31] merge http://sourcefrog.net/bzr/remove-sftplock http://bazaar-vcs.org/bzr/bzr.dev [04:31] Command failed! [04:31] All lines of log output: [04:31] Executing pre-commit hook /home/pqm/bin/kill-chroot-processes.sh /srv/pqm.ubuntu.com/chroot-amd64 && /home/pqm/bin/dchroot-run make check at Thu Feb 5 04:26:46 2009 [04:31] Scanning for processes to kill in chroot /srv/pqm.ubuntu.com/chroot-amd64 [04:31] Scanning for processes to kill in chroot /srv/pqm.ubuntu.com/chroot-amd64 [04:31] removed directory: `/srv/pqm.ubuntu.com/chroot-amd64/tmp/bzr-limbo-011qkx' [04:31] spm: ^ [04:32] hrm [04:32] tom did some changes there this morning.... [04:32] my guess [04:32] the commit before left dirt [04:33] and the kill-checker found that dirt and exited non-zero as a result [04:33] so -- resubmit your merge [04:33] and file a bug that we aren't cleaning up bzr-limbo-011qkx during test runs [04:33] and tell everyone to submit every merge twice until we do :P [04:33] :/ [04:34] or we can roll the clean-checker back [04:34] but we had a bunch of stale bzr test processes yesterday, from months back [04:34] and the sysadmins pinged me [04:34] this is an existing tool written for lp [04:36] lifeless: would it be worthwhile reverting tom's change to pqm-config, till you guys get this stuff sorted? [04:36] the second request i sent just failed too [04:36] spm: things without motivation often don't get sorted [04:36] poolie: interesting, hang a tick [04:36] lifeless: what's it supposed to do? [04:37] spm: can you check if there is other dirt left behind? [04:37] spm: perhaps the check is not fully cleaning [04:37] poolie: basically is doing: for ROOT in /proc/*/root; do === in the chroot [04:37] lifeless: sure, one sec [04:37] poolie: it finds processes and temporary directories created in the chroot, and zaps em [04:37] as part of the *next* merge? [04:37] poolie: so that old test runs that left cruft don't cause spurious success||failure to new ones [04:38] poolie: that part seems odd to me too :P [04:38] spm: I'd be inclined to run it before and after, FWIW [04:38] ok and the third one just failed too [04:38] lifeless: a prehook as well? [04:38] istr that pchroot or dchroot handles this as a standard feature [04:39] spm: /home/pqm/bin/kill-chroot-processes.sh /srv/pqm.ubuntu.com/chroot-amd64 && /home/pqm/bin/dchroot-run make check && /home/pqm/bin/kill-chroot-processes.sh /srv/pqm.ubuntu.com/chroot-amd64 [04:39] spm: for lp too IMO, but thats a different discussion. Lets find out the cause of this problem, and then unblock poolie [04:40] sure - fixing - one tick [04:41] poolie: try now [04:42] ok sent [04:50] spm: still sucks [04:51] lifeless: I think we're picking up procs from another chroot on that box [04:51] spm: better disable it for now then [04:51] spm: if you would be so kind [04:51] 2/2 then? :-P [04:52] yes, please disable it [04:52] well, 2/1 for zings, and $help-each-other-whenever ;) [04:52] 2/2 what? [04:52] hahahahha [04:52] 100% of my submissions have failed [04:52] it sounds like a useful feature but only if it works :) [04:54] poolie: you happen to know if bzrtools is gonna get updated in ~bzr PPA any time soonish? [04:54] yes, soon [04:54] LaserJock: what do you use from bzrtools btw? [04:55] poolie: go for it. btw did I ever mention that bzr rocks for doing config file management? [04:55] poolie: I have no idea but I can't upgrade bzr-svn I don't think [04:55] ? [04:55] spm, trying again [04:56] I don't know, but I can' do a clean upgrade, I've gotta remove something, let me check [04:57] ok, so I can upgrade bzr and bzr-svn but bzrtools gets removed [04:57] I don't know what all is in bzrtools but I've always been told it's pretty important to have [05:01] spm, ok, i got a real failure, yay [05:01] poolie: cool - progress of sorts :-) [06:07] night all [06:07] poolie: were you going to reply to that mail ? [06:14] * spiv heads off to SyPy [06:19] how do I get bzr to show me the revision id of the last revision from the commandline? [06:20] thumper: bzr revision-info [06:21] ta [06:56] hi all [07:12] hello vila [09:22] me blinks. [09:22] I thought autopack only did its thing when we got up to 10 packs (or various farther iterations) [09:39] moin === mark1 is now known as markh === kiko is now known as kiko-afk [11:54] hello, i'm affected by this bug https://bugs.launchpad.net/bzr/+bug/319790 (can't unshelve my changes) [11:54] Launchpad bug 319790 in bzr "bzr unshelve crashes losing all changes" [Medium,Confirmed] [11:54] someone suggests restoring the shelf manually, but how do i do it? [11:58] jelmer: say - are there any plans to have some kind of content-addressing in bzr? === AfC1 is now known as AfC [13:06] night all [13:18] ugh [13:18] mac and windows encoding are not getting along [13:18] does anyone know how I can avoid getting into this situation? http://paste.ubuntu.com/114010/ [13:19] ouch [13:24] igc: You're probably gone now, but the "log multiple files and directories" merge directive you just sent has an incorrect target_branch, so BB won't track it. [13:26] beuno: playing with the encoding options when mounting the sshfs? [13:26] beuno: hi!, btw [13:27] verterok_, hai! [13:27] verterok_, no sshfs involved :( [13:27] blain branching back and forth [13:29] :/ [13:29] jelmer: ping? === thunderstruck is now known as gnomefreak === kiko-afk is now known as kiko [14:07] Hi all [14:07] jelmer: I guess subvertpy is in NEW... is the package available somewhere in the meantime? [14:10] pypi? [14:12] ? [14:12] python package index [14:13] I'll have a look, thanks. [14:13] its easy-install able [14:13] Oh. No go then, I need dpkg-able :-) [14:13] hmm [14:14] maybe there is a ppa on launchpad [14:14] * Lo-lan-do rebuilds from the source package available in the PPA [14:14] jelmer: btw, how does one do a commit with message from a wc/client in subvertpy? [14:15] client.commit seems to be without message [14:16] are the messages done with callbacks? [14:16] i have no idea === thunderstruck is now known as gnomefreak [14:20] ronny, you need to specify a callback for the message [14:20] ronny, client_ctx.log_msg_func = lambda items: "bla" [14:20] yikes [14:21] items is the list of things being committed [14:21] jelmer: is it possible to tell it the author? [14:21] ronny, the callback ? no, the author isn't known at that point [14:22] svn sends back the author only once the commit is done [14:23] what where they thinking? [14:27] jelmer: I was looking at the md-bzr debian branch - ironpython shouldn't be in the build-depends [14:39] Hello, I thought there was a way to attach metadata to a file in bzr, but I can't seem to figure out to do it. Can I do that from the command line? [14:41] new version will depend on bzrtools, though, and xmloutput (once there's a deb package) [14:43] is there a way to use bzr to generate an upstream tarball using the version in the debian/changelog? [14:43] Tak, right now, it does depend on ironpython, see the mdp file [14:43] gnomefreak, bzr builddeb --export-only . IIRC [14:43] jelmer: btw, do you guys have any plans for content-addressing? [14:43] jelmer: thanks ill try it [14:43] i need a git-alike object db soon that can handle more than just blob/tree/commit/tag [14:44] however i need it content-addressed [14:44] that failed :( [14:44] I can remove the reference, but it's not being used anyway [14:45] gnomefreak, it works fine here, what error do you get? [14:45] jelmer: http://pastebin.mozilla.org/616311 [14:46] ronny: I'm not sure I follow [14:46] ronny: What do you mean by content-addressing? Being able to fetch revisions/texts by their checksum? [14:47] gnomefreak, you're not exporting upstream from bzr, any reason for not just using uscan? [14:47] jelmer: yeah [14:47] ronny, I don't think there are any plans for that [14:47] ok [14:47] jelmer: not sure how would be the biggest reason [14:47] then i'll reimlement git's object db soon [14:48] git cant be extended with new types [14:49] maybe ill just get the most recent and update change as needed [14:50] hi, any bzrlib hackers here? [14:50] gnomefreak: uscan already parses debian/changelog, I think if you use the right magic options for it it can download the appropriate tarball [14:50] hi bialix [14:50] I have question about test [14:50] hi jelmer [14:50] jelmer: thanks ill look at man page [14:51] my question is: how can I test that some method I call write rnings? [14:51] warnings [14:51] I'd like to avoid write black-box test [14:52] any ideas? [14:59] * bialix looks at TestCase attributes [15:00] or maybe I need to use bzrlib.trace.push_log_file? [15:19] push_log_file is fine [15:57] something missing from the bazaar user guide is if using bazaar server by itself provides any form of security [15:59] santagada: It does not. That's what running it through ssh is for. :) [15:59] Or http. [16:01] Or SMB if you're on an all-Windows LAN. [16:04] but http is not using the smart server right? [16:05] The smart server can be used over HTTP. [16:06] MattCampbell: really? that is not on the user guide I think [16:07] MattCampbell: Great! that was one of the problems I thought when moving from subversion to bazaar... [16:07] santagada: What's wrong with bzr+ssh? [16:08] MattCampbell: firewalls, stupid firewalls, and windows users [16:09] What's wrong with bzr send + email? Surely even Windows users can send mails... [16:09] MattCampbell: and it is far easier to connect a subtree of a web server to ldap than to change a whole system login to suport a dev team [16:09] Lo-lan-do: :) [16:10] Hmm, let me double-check that you can run the bzr smart server over HTTP; I may be confusing bzr with Mercurial. [16:15] Now I'm curious; does Launchpad even support authenticated bzr access over HTTP? [16:15] I know Launchpad supports bzr+ssh via a custom SSH server using twisted.conch. [16:16] And as for firewalls, surely they don't block HTTPS, do they? [16:17] I'd hope not, though some especially anal ones may require you to use a proxy with the CONNECT command. [16:17] http://sam.zoy.org/blog/2007-04-23-use-sshd-and-httpd-on-the-same-port-almost is your friend [16:18] most "especially anal" ones don't support CONNECT at all [16:18] in my experience [16:18] there is a firewall on some machines on my university that blocks some http verbs that mod_svn uses [16:18] Then I suppose they allow direct access to port 443. [16:18] In my experience, these ones are more of a hindrance to work getting done than anything else, so the problem becomes a human problem that technical solutions won't help solve. [16:18] so you can update/checkout from http but not commit [16:19] MattCampbell: yes, using https solves the problem [16:20] Does anyone know of a firewall that monitors the traffic on outgoing connections to port 443 to make sure it's really SSL? [16:20] still as I don't have the custom ssh server lp uses I prefer https with ldap for repo comunication [16:21] MattCampbell: yes, the traffic shappers used by some ISPs does this [16:21] santagada: You could probably do a good imitation of Launchpad's ssh server if you know Python and Twisted. [16:21] You can still tunnel SSH over SSL then. [16:21] MattCampbell: yep... but still, http and ldap can be used by non python programmers [16:22] I assume Launchpad's custom SSH server is part of the code-hosting component which will be kept proprietary. [16:22] Lo-lan-do: double the encryption for double the security? :) [16:23] No, double the encryption so these proxies can only see an SSL stream without knowing it's really SSH inside. [16:23] Lo-lan-do: I got it, but it still doesn't solve the problem of having a ssh server that uses ldap for authentication, without messing with the system one [16:24] I'm not sure I follow... [16:24] Why do you want two sshds? [16:25] Lo-lan-do: if your set of bzr users are not the same as your unix users [16:25] Lo-lan-do: or for example if you have a windows server [16:25] Oh, *ugh* [16:26] Lo-lan-do: both of the situations happen [16:27] I bet they do. Poor guys... [16:27] no, they're not poor, because bzr gave them rich-roots! [16:29] hi garyvdm [16:29] Hi [16:29] I've looked at the bug about UI factory [16:29] but did not find solution quickly [16:30] it seems there was big change recently [16:30] bialix: I'm looking at it atm. [16:30] old code rely on self.stdout/self.stdin [16:30] * bialix nods [16:30] Yhea that was me - but stdout/stdin should be there [16:31] I've tracked it down to bzrlib [16:31] I'm getting a different traceback [16:31] you've changed the base class, there I'm stopping [16:31] I'm running bzr.exe 1.11 [16:31] I guess you're using bzr.dev [16:32] I have the same problem on 1.11 and bzr.dev [16:35] This is the traceback I'm getting [16:36] I get it from any q* command. Ones that use the subprocess ui factory like qpull, and ones that use in process ui factory, like qlog. [16:36] I don't get it if I just run bzr pull [16:37] I get it if I revert back to rev 575 of qbzr [16:37] which is before I started changing the ui factories [16:38] hmmm [16:38] can you pastebin your traceback [16:39] * bialix reverts to 575 too [16:39] http://pastebin.com/d7f36feaa [16:39] Sorry - I pastebined it a while ago and forgot to send the url <-- silly me [16:40] you've got completelly different error [16:40] Same problem with rev 549 [16:40] can you try with lp: url? without ssh key [16:41] I don't have the problem with 575 [16:41] * garyvdm tries to figure out how to disable his ssh key on ubuntu [16:42] oops [16:42] * bialix has no idea [16:42] Got it [16:42] santagada: BTW, you *can* run the bzr smart server over HTTP; it's documented in the user guide. You can use either FastCGI or Apache 2 with mod_python. [16:45] bialix: Going to boot Windows [16:45] MattCampbell: I was at section 7.4... thanks [16:45] garyvdm: no problem with r576 too [16:45] * bialix waits for gary to rebbot [16:46] MattCampbell: I think there should be a link to the appendice about it... or a more proiminent one [16:46] Ahh - bialix - can I give you a bundle to test [16:46] of course [16:48] santagada: Or sinze the smart server's HTTP transport is a WSGI application, you can run it as a separate HTTP server (using e.g. wsgiref or paste.httpserver) and have Apache proxy to it. [16:49] There are actually very many options for deploying a WSGI app, as I recently learned. [16:49] garuvdm: btw, there is another bug introduced in r579. when I click Cancel in password dialog the subprocess cannot stops [16:49] garyvdm: sorry ^^ [16:51] MattCampbell: yep, if it is a wsgi app it is very very flexible [16:52] MattCampbell: my latest idea is use cherokee web server + scgi [16:53] santagada: Why Cherokee? [16:54] MattCampbell: Cherokee is very light, like lighttpd but seems even simpler to configure [16:55] maybe ngix is also a good idea... or lighttpd [16:57] garyvdm: you're still here? [16:57] Yhea [16:57] r576-581 (including) have no problem for me [16:58] offending revision is 582 [16:58] bialix: I've just sent you bundle. [16:58] Gary, why you need to change base class? I'm curious [17:00] Because TextUIFactory expects to be able to prompt the user and get a response from stdin [17:01] The only situation qbzr can handle that is for passwords. [17:02] hmmmmmmmmmmmmmmmmmmmmm [17:02] I cannot reproduce the bug on the netbook with English XP [17:03] but can on Russian Windows [17:03] I don't even know what this bug is, but it smells like a Unicode problem. [17:03] I think the problem my be with using super - so maybe python version. [17:04] Well, my comment is based on bialix's one statement about the bug happening on Russian Windows but not English Windows. [17:04] MattCampbell: The error: AttributeError: 'SubprocessUIFactory' object has no attribute 'stdout' [17:05] bug 324758 [17:05] Launchpad bug 324758 in qbzr "'SubprocessUIFactory' object has no attribute 'stdout'" [High,New] https://launchpad.net/bugs/324758 [17:05] weird [17:06] but there different plugins set [17:07] garyvdm: different traceback now [17:07] bzr: ERROR: exceptions.TypeError: __init__() takes exactly 1 argument (4 given) [17:08] File "C:\work\Bazaar\plugins\qbzr\lib\subprocess.py", line 617, in __init__ [17:08] bialix: ok - let me boot into windows [17:09] garyvdm: http://pastebin.com/m27669343 [17:11] * bialix waits [17:12] garyvdm: http://pastebin.com/m27669343 [17:13] garyvdm: it seems in the older bzr versions CLIUIFactory constructor has only self argument [17:14] How recognizable is the bzr crowd? [17:14] For the sake of example, let's assume the context of a large beer-oriented pub filled to the brim with geeks. [17:15] I find I quite often use 'bzr shelve' etc.. in svn checkouts. If I haven't used it for a while, it has to spend a while pulling changes from the SVN repo. Is there some command I can schedule via cron, maybe, so that my local bzr-svn cache is kept up to date? === bac is now known as bac_lunch [17:15] Lo-lan-do: the guys prasing Linus Torvalds as a (semi)god are probably git-fanatics ... [17:16] LeoNerd: I think that's a bug I reported already, and jelmer said it would be fixed for 0.5.1. [17:16] bialix: Got to do some work related stuff - but I'll return shortly [17:16] * bialix going to home soon [17:16] Lo-lan-do: Oh.. I don't think it's a bug... it works well enough.. I just would like it to keep its cache up to date while I'm not using it. Say, overnight. [17:17] GaryvdM: if I'm commenting out extra args from constructor I'm get the same traceback [17:18] LeoNerd: Five minutes for a bzr update when there's only one revision to pull qualifies as a bug for me, but YMMV. Anyway, just run "bzr update" at night, and you should be fine. [17:18] I guess we can simply set stdout attribute from our code if bzr < 1.12 [17:19] GaryvdM: I'm heading to home, will try to check the trick with stdout at home [17:20] GaryvdM: but it seems we should override CLIUIfactory constructor in the way similar to TextUIFactory [17:21] * bialix bbl [17:21] Lo-lan-do: Oooh.. Well, if there really is only one revision then mine is quick. It's just our repo is massive, it gets the order of 5 commits a minute. If I haven't used bzr-svn in a few weeks, it has to spend many minutes catching up. I'd like to have a daily cron task that keeps the cache fresh, as of that morning [17:22] LeoNerd: Apparently (from the logs) something scans all SVN revisions after having fethed the new ones. [17:23] If I'm up-to-date, a bzr update takes ~10 seconds. [17:23] ditto, at least [17:23] If I need to pull revs, then it's ~15 seconds doing useful stuff followed by ~5 minutes spent doing "something" to every revision in the cache. [17:24] In my case we have ~7000 revs in SVN. [17:24] mine is like 130k [17:25] Tak: And it's still fast? [17:25] I must be doing something wrong then... [17:25] ...fast? [17:26] Sorry, I may have misunderstood. Do you also see delays of several minutes when doing a bzr update? [17:27] terminology question: in bzr, do people tend to refer to the mainline as "mainline", "trunk", "master", or something else? [17:29] I tend to use trunk because that's what people coming from SVN know. [17:30] Also, because it sits well with the concept of branches. [17:30] kfogel: "what mainline" ? [17:30] The one with the Holy Penguin Pee, of course. [17:31] LeoNerd: "mainline" == "the branch that developers of the project socially agree contains the latest code that is ultimately destined for release" [17:31] kfogel: But such a concept doesn't always exist [17:31] I would s/release/the next release/ [17:31] That's surely the point of decentralised working, no? [17:32] LeoNerd: no, I don't think it is. The concept always exists, as a concept :-). Whether it exists in a given project is usually not a matter of controversy, but can sometimes be. [17:32] LeoNerd: another way to think of it is "the place where a change needs to land to be taken seriously by the group of people who call that place 'mainline'". [17:33] LeoNerd: So you see, it's not less decentralized, it's just that the term can be relative. As indeed it can be with a centralized VC system too. [17:34] kfogel: I call it the „official“ branch or refer to it by name; for instance „In bzr.dev ...“ [17:35] (I still don't know how to find you guys tomorrow night at the Delirium Café...) [17:36] clemente: that works, though not equally well in all writing contexts [17:36] I guess I'll go with trunk for the generic term, for now. [17:37] Lo-lan-do: yeah, I see long delays when updating, pulling, merging, even when there are no changes [17:37] Tak: Ah. Reproducibility is always good :-) [17:45] bialix: I can reproduce the problem now. [17:46] sorry if this is a ridiculously stupid question, but I'm trying to figure out whether bzr or git is better for me, and I cant find a way of creating a local branch in bzr - am I missing something? [17:46] \] [17:46] benrometsch: Bzr doesn't support git-like local branching. You only get one branch per directory. [17:46] right that's what I thought [17:47] is there a philosophical reason for this? [17:47] "Not implemented yet". Not very philosophical :-) [17:47] lol [17:47] Well, it depends on what you call a local branch, actually. [17:48] Lo-lan-do: is there really a plan to have something like this? [17:48] Necoro: Apparently there is. The keyword is "colocated branches". [17:48] ah ok [17:48] I thought, that it was really avoided as of "we do not want this" [17:48] benrometsch: "bzr branch $remote" gives you a branch that is local, doesn't it? [17:49] I have never understood the "need" for colocated branches [17:49] but I mean you cant switch branches within the same directory [17:49] Necoro: I think it's "we do not want this unless implemented properly", which is slightly different. [17:49] so if I have a project with files/dirs in it I cant create a local brach, make changes and then if required quickly revert back to the original branch [17:49] benrometsch: Correct, although you can simulate that with a shared repo and a lightweight checkout. [17:50] yeah but that's just like SVN... [17:50] and we already use SVN [17:50] benrometsch: Oo - bzr branch $remote b; cd b; code ...; cd ..; rm -rf b [17:50] I don't have a good answer for you then I'm afraid :-/ [17:51] benrometsch: or I am not really understanding your point ;) [17:51] as the branch you get with "bzr branch" is _local_ as in: the remote branch does not notice any changes you do here [17:51] i just like the way in git you can easily create branches locally without having to create a seperate directory structure [17:51] Necoro: "in the same directory" [17:51] and then flick between then with a simple command [17:52] well ... I have a shell alias for sth like this ;P [17:52] "cdp branch" [17:52] ^^ [17:52] That's what colocated branches are about, and they're at the discussion stage. [17:52] tbh the experience of playing with bazaar vs git - bzr is much nicer [17:52] cleaner OSX install, better documentation [17:53] git has been problematic for us here esp in windows [17:54] so is $remote a special keyword when branching>? [17:54] eh no [17:54] it is just a placeholder for the remote branch URL [17:54] ;) [17:54] ok I see [17:54] just wanted to check [17:55] "bzr branch ", if you prefer [17:55] benrometsch: btw: have you had a look at mercurial ... just to give you another option at hand in case neither bzr nor git are what you are looking for [17:55] though I do not know if hg has "local branches" [17:56] yeah I just downloaded it a moment ago [17:57] (the one thing I really prefer from bzr over hg and git are "revision numbers" ... not having stupid SHA-hashes one has to deal with) [17:57] Necoro: Hg does have local branches, but you can't delete them once you create them. (Recently it became possible to hide them though.) [17:58] Peng_: well ... not being able to delete them could be an issue ... [17:58] Indeedy. [17:59] Generally people use separate clones for short-lived branches, just like in bzr. [18:00] benrometsch: this local branch thingie might be what I was looking for [18:00] and not having local branches has one advantage: you clearly see on what branch you are working on ;) - w/o having to do "git branch" or tweak your shell prompt ;) [18:00] keep the directory I'm working with but change the branch [18:00] Though you can tweak your shell prompt if you want to. [18:01] Who doesn't want "cd" to take 300ms? [18:01] probably just moving things around would do also [18:01] Peng_: my shell prompt shows me the current bzr revno and whether there are uncommited changes ;) [18:01] on larger repos I have to turn it off ^^ [18:02] yeah santagada local branches are one of the things I think would really speed stuff up but I take other people's points that having directories explicitly defining branches can be useful [18:02] with git it could be less problematic as it is way faster [18:02] the problem I see is with dev tools [18:03] for example textmate has the concept of project wich is a directory [18:03] yep that's what would help us - being able to just update changed files rather than having a whole new directory [18:03] ahh forget it... it is just an "mate ./" anyway [18:04] benrometsch: what ide/editor do you use? [18:04] Lo-lan-do: Hi! [18:04] Hi jelmer :-) [18:04] Lo-lan-do, We don't really stand out from the rest of the FOSDEM crowd I think.. [18:04] benrometsch: if you just want to overwrite the current dir w/ another branch and do not care about local changes, "bzr pull" is your frient [18:04] intellij idea [18:04] s/frient/friend/ [18:04] Lo-lan-do: I'll try to wear my Bazaar t-shirt at the beer event on friday [18:05] 'kay [18:06]