| vadi2 | Hi, I have a question about bzr-git. My project is using bzr, but I'd like to embed another one in it that uses git. Would it be best to store the git one in another folder outside and just copy over the contents periodically, or can something be fancy done with bzr-git to help with this? | 00:30 |
|---|---|---|
| james_w | vadi2: you would be able to do that with bzr-git | 00:36 |
| james_w | it requires nested tree support in bzr, which isn't quite there yet | 00:36 |
| james_w | so trying to do it right now would be a bit tricky | 00:36 |
| vadi2 | alright. I can wait | 00:37 |
| vadi2 | is there any report I can subscribe to? | 00:37 |
| james_w | I don't think so | 00:38 |
| james_w | I think there's a wiki page though | 00:38 |
| james_w | and there's been plenty of discussion on the mailing list in the last couple of months | 00:39 |
| vadi2 | https://blueprints.launchpad.net/bzr/+spec/nested-tree-support ? | 00:41 |
| vadi2 | yep, looks like what I need | 00:42 |
| james_w | so, there't the "join" command that can join two trees together | 00:43 |
| james_w | but I'm guessing that you're not really joining them, the git project is still external, you just want to embed a copy of it? | 00:43 |
| vadi2 | yeah. | 00:43 |
| james_w | yeah, then you need that nested tree support unfortunately | 00:43 |
| vadi2 | alright. I've subscribed to the blueprint, so we'll switch as soon as that's in | 00:44 |
| james_w | cool | 00:44 |
| vadi2 | thanks for your time | 00:45 |
| visik7 | hi guys | 01:04 |
| visik7 | I'm thinking of implementing a new protocol for bazaar | 01:04 |
| visik7 | where should I start ? | 01:04 |
| Peng_ | Just out of curiousity, what kind of protocol? Wh? | 01:10 |
| Peng_ | Err, why*? | 01:10 |
| Peng_ | Apparently I'm curious enough to ask, but not enough to stay around for the answer. See you later! :D | 01:10 |
| * Peng_ /away! | 01:10 | |
| AfC | visik7: I assume you're current with all the discussion, analysis, and work that is currently being done with the existing smart server protocol. What do you want to do that is different? | 01:17 |
| visik7 | I want to implement bazaar over an IM protocol | 01:18 |
| === Kissaki is now known as Kissaki^0ff | ||
| KX | ... well that's a novel concept | 01:18 |
| visik7 | so I could push and pull from my collaborators without an intermediate server and without forcing others to install servers or anything harder than a plugin :) | 01:19 |
| visik7 | wouldn't be cool if you could just say hey pull from me my latest changes | 01:19 |
| visik7 | something like bzr avahi but over IM | 01:19 |
| Peng_ | avahi isn't actually a transport, just a discovery mechanism. | 01:21 |
| Peng_ | Can IM networks do multiple Mbps of traffic? | 01:21 |
| Peng_ | Seems like a doable, though terribly inefficient, idea. | 01:21 |
| * Peng_ shrugs. | 01:21 | |
| * Peng_ goes back to being /away. | 01:21 | |
| visik7 | I think is great | 01:22 |
| visik7 | you'll not discourage me | 01:24 |
| visik7 | :) | 01:24 |
| AfC | visik7: well, if you can "send files" between you and your buddies, then just use `bzr bundle` to create patch bundles and send those across. It's not quite push and pull, but once you receive a bundle you just merge (or pull) as you would normally. | 01:28 |
| AfC | (we do that all the time) | 01:28 |
| AfC | Otherwise, yes, I imagine the bzr dbus/avahi work that Robert did a few years ago might be a place to start. | 01:29 |
| === KX is now known as zombor | ||
| === zombor is now known as KX | ||
| === KX is now known as Clippit | ||
| === Clippit is now known as KX | ||
| lifeless | fullermd: around? | 08:08 |
| lifeless | fullermd: https://edge.launchpad.net/libcpuinfo/ needs a BSD module | 08:08 |
| fullermd | lifeless: Hm. I'll take a look... | 10:21 |
| lifeless | fullermd: only if you care ;) | 10:21 |
| fullermd | Well, see, I'm thinking of the work I should be doing tonite... it's tempting to care about classifying toenail clippings instead of that, so... ;p | 10:22 |
| fullermd | Hm. "the University" is listed in the 3rd clause of the license? | 10:25 |
| lifeless | oh foo | 10:27 |
| lifeless | I'll correct that | 10:27 |
| fullermd | Not to get into a license discussion, but why 3-clause instead of 2? | 10:27 |
| lifeless | Isn't 3-0clause the modified? 4-clause was evil | 10:27 |
| lifeless | 3-clause is what debian carries as the 'stock BSD' | 10:27 |
| fullermd | I tend to use a 2-clause. | 10:28 |
| lifeless | so just 1 and 2? | 10:29 |
| fullermd | Yah. It ends up being isomorphic to the MIT/X license. | 10:29 |
| lifeless | I'll look into that later | 10:29 |
| * fullermd nods. | 10:29 | |
| lifeless | for now the obvious change is sufficient | 10:29 |
| fullermd | How'd you have in mind handling the OS choice? | 10:30 |
| fullermd | Just #ifdef's? | 10:30 |
| lifeless | if trying to read /proc/cpuinfo will segfault or something | 10:31 |
| lifeless | but just chaining the ifs should be simple and easy | 10:31 |
| lifeless | if it won't compile a particular check on other platforms then yes ifdefs are solid | 10:31 |
| fullermd | Probably won't link, I'd use sysctl(3) (not (1)) on BSD, so... | 10:32 |
| lifeless | specifically change | 10:32 |
| lifeless | if (result < 1) goto fail; | 10:32 |
| lifeless | insert before that | 10:32 |
| lifeless | if (result < 1) result = cpuinfo_MODULE_processor_count(); | 10:32 |
| fullermd | But chaining the if would work OK, there's nothing in /proc but pid's and a curproc symlink (if it's even mounted) | 10:32 |
| fullermd | Oh, I was thinking in cpuinfo_proc_cpuinfo_proccessor_count() | 10:33 |
| lifeless | I prefer to build as much as possible because it avoids things bitrotting as much | 10:33 |
| lifeless | adding a bsd module should be as simple as adding a new .c and .h | 10:33 |
| lifeless | and changing cpuinfo_processor_count to call your new function | 10:33 |
| lifeless | which itself would return -1 on 'cant tell' or otherwise a count | 10:33 |
| * fullermd nods. | 10:34 | |
| lifeless | proc_cpuinfo is a specific module | 10:34 |
| fullermd | Gotcha. | 10:34 |
| fullermd | I'll take a poke after I get some coffee... | 10:34 |
| lifeless | sweet | 10:34 |
| === Kissaki^0ff is now known as Kissaki | ||
| fullermd | lifeless: Push up a branch and figure out how to send a review request? | 11:26 |
| lifeless | sure | 11:28 |
| fullermd | 'k, sent. | 11:34 |
| lifeless | lol copy n paste :) | 11:37 |
| fullermd | I don't have any convenient non-BSD systems to check it on, but it should build cleanly I think. | 11:37 |
| lifeless | +/* Probe proc/cpuinfo */ | 11:37 |
| lifeless | testing it | 11:37 |
| fullermd | Darn network corruption! | 11:37 |
| fullermd | Why did that show up in my bzr mailbox... | 11:38 |
| fullermd | Oh, frell. Freakin' LP... | 11:38 |
| lifeless | ta! | 11:41 |
| fta | I have a *local* svn repo. how can i import it to bzr? it's huge (> 4GB) so i'd prefer to not to do it over the network, but it's not a svn:// url.. | 12:37 |
| hsn_ | bazaar supports just one .bzrignore file per tree? | 12:38 |
| * AfC wonders if there is a fast-export that takes a svn-dump as an import? | 12:57 | |
| AfC | fta: (I know that Jc2k used svn dumps to import all of GNOME into bzr) | 12:57 |
| AfC | oh, wait... can't you use file:/// URLs with Subversion? If so, that should Just Work with $whichever bzr conversion tool you're using (maybe)? | 12:58 |
| fta | well, my 1st try was with bzr branch svn:// | 12:59 |
| AfC | My first use of Subversion was with a file:/// repo, but that was *long* ago. | 13:03 |
| fta | ok, i figured out how to start my svn import from my local copy, but for some reason, it's doing a lot of http :( | 14:33 |
| fta | [\ ] http 268885KB 1270KB/s | copying revision 17/14146 | 14:34 |
| fta | will take a while :( | 14:34 |
| fta | it died after 2000 revisions :( | 15:58 |
| visik7 | is there a way to get a mail on commit ? | 20:00 |
| ronny | hmm, where is jelmer? | 20:12 |
| === sabdfl1 is now known as sabdfl | ||
| davidstrauss | There's a story behind the code name for 1.16, isn't there? | 22:01 |
| thumper | davidstrauss: yes | 22:20 |
| thumper | jml was wanting to get it out on Thursday | 22:20 |
| davidstrauss | thumper: Makes sense now :-) | 22:21 |
| thumper | but it ended out being Friday (Sydney time) which was still Thursday on the west coast of the us | 22:21 |
| thumper | US | 22:21 |
| davidstrauss | I figured it was a time zone thing | 22:21 |
| davidstrauss | :-) | 22:21 |
| visik7 | anyone using buildout ? | 22:22 |
| Basic | bzr.dev revision:4439 seems really slow, just a local issue or others notice this too? | 22:30 |
| Peng_ | I haven't noticed any issues, not that I've used it much. | 22:30 |
| Basic | looking at check-ins | 22:31 |
| jml | good morning #bzr | 23:45 |
| james_w | morning jml | 23:46 |
| lifeless | moin | 23:47 |
| RAOF | Morning jml. | 23:47 |
| jml | RAOF, lifeless, james_w: g'day | 23:47 |
| james_w | spot the odd one out | 23:48 |
| poolie | hello all | 23:50 |
| === lifeless is now known as all | ||
| all | hi | 23:50 |
| === all is now known as lifeless | ||
| jelmer | ronny: hi | 23:56 |
| poolie | hello ronny | 23:56 |
| poolie | and jelmer | 23:56 |
| jelmer | fta: hi | 23:56 |
| jelmer | moin poolie | 23:56 |
| Peng_ | Hmmm, all of you here? I smell productivity! :D | 23:57 |
| lifeless | nooooooooo | 23:57 |
| jml | poolie: hi | 23:58 |
| jml | james_w: :) | 23:58 |
Generated by irclog2html.py 2.7 by Marius Gedminas - find it at mg.pov.lt!