| === Kissaki is now known as Kissaki^0ff | ||
| === cody-somerville_ is now known as cody-somerville | ||
| davidstrauss | Glenjamin: still having that move problem? | 00:37 |
|---|---|---|
| Glenjamin | nah, i figured it out | 00:37 |
| Glenjamin | although i reckon there's scope to make bazaar smarter about moving directories | 00:37 |
| Glenjamin | the short version is that you cant move things into a non-versioned directory | 00:38 |
| Glenjamin | so dir1 => dir2/dir3 doesnt just work | 00:39 |
| igc | morning | 00:43 |
| davidstrauss | What's the status of bzr-tools vs. bzr-1.15? | 00:55 |
| davidstrauss | nevermind | 00:58 |
| gutworth | lifeless: hi | 01:49 |
| AfC | Why would bzr (talking to Launchpad) have to do ~ 300 kB of data to transmit a single revision with about 1 lines of changed code in it? | 02:52 |
| bob2 | recent branch format? | 03:03 |
| AfC | bob2: certainly | 03:11 |
| AfC | It's been the same for each of several single revision pulls over the last few days. | 03:12 |
| AfC | I don't normally interact with Launchpad (or use http), so this is all a bit of a surprise. | 03:12 |
| AfC | But that's where the contributor put their branch, so {shrug} | 03:13 |
| AfC | I have the opportunity to enjoy the experience. | 03:13 |
| krisfremen | is there a way for bzr log to only show the log for the last revision? | 03:47 |
| gutworth | bzr log --limit 1 | 03:47 |
| krisfremen | thanks gutworth | 03:48 |
| igc | krisfremen: bzr log -r-1 will do the trick as well | 04:13 |
| * igc lunch | 04:13 | |
| krisfremen | hmm, indeed | 04:14 |
| krisfremen | thanks | 04:14 |
| profchaos | I have some problem getting the latest from a launchpad bzr branch. I have the error pasted at http://dpaste.com/hold/47393/ any directions? | 06:25 |
| bob2 | profchaos: double check that link | 06:26 |
| bob2 | profchaos: if that is the right one, it's unrelated to bzr, but you need to install cdbs (and build-essential and fakeroot and anything else listed in the Build-dep line in debian/control) | 06:30 |
| profchaos | I'm new to bzr, i might well be wrong | 06:31 |
| bob2 | I mean, check the link to see if it is the one you meant to paste, since it'z not a bzr problem :) | 06:32 |
| profchaos | yes that's my paste for sure | 06:32 |
| Quozl | odd, what was the command line of that paste? | 06:32 |
| * bob2 guesses bzr-buildpackage | 06:33 | |
| profchaos | ./debian/rules get-orig-source LOCAL_BRANCH=../upstream/chromium-browser.svn | 06:33 |
| Quozl | apt-get build-dep? | 06:34 |
| bob2 | only if the package is in Debian (and has the same build-deps) | 06:34 |
| Quozl | agreed. | 06:34 |
| profchaos | I'm not sure i was trying to follow https://wiki.edubuntu.org/Chromium/Build | 06:34 |
| Quozl | ... interesting ... then why ask in #bzr? ;-} | 06:35 |
| profchaos | I'm just trying to get the current source from lp:chromium-browser | 06:35 |
| bob2 | I don't think that command produced that error | 06:36 |
| bob2 | more likely the next one | 06:36 |
| profchaos | @bob2 normally, how do we get the latest of a bzr launchpad branch? | 06:37 |
| bob2 | what? | 06:37 |
| bob2 | 'bzr branch lp:whatever' | 06:37 |
| profchaos | let me try that now | 06:38 |
| bob2 | qanyway, if the instructions don't work, best to contact the people who wrote them | 06:38 |
| Quozl | yeah, the instructions obviously don't work on your system. | 06:38 |
| profchaos | @bob2, bzr branch lp:chromium-browser seemed to work. it copied some files to my system now, but i see just a couple of files in the target folder. | 06:40 |
| bob2 | as above | 06:41 |
| bob2 | bzr got you the files you asked for - anything beyond that is up to the scripts you're running | 06:41 |
| bob2 | it could potentially bea problem in bzr-buildpackage, but you'd need to pastebin your shell session | 06:41 |
| profchaos | okay, let me check what else has gone wrong | 06:43 |
| profchaos | thanks anyways | 06:43 |
| profchaos | ls | 06:44 |
| lifeless | guhi | 06:54 |
| bob2 | lifeless: back to work | 06:54 |
| igc | hi lifeless - morning! | 07:13 |
| lifeless | hi | 07:14 |
| lifeless | we should have sprint stuff happening in a few hours at most | 07:15 |
| === abentley1 is now known as abentley | ||
| === jml changed the topic of #bzr to: Bazaar version control system | 1.15final released 22 May, 2009 | http://bazaar-vcs.org | http://irclogs.ubuntu.com/ | http://planet.bazaar-vcs.org/ | Sprinting in Barcelona | ||
| mwhudson | Peng: of course, what we need is a generic transport-to-http adapter :) :) | 08:12 |
| Youssef | Hi All | 08:16 |
| Youssef | I have a question | 08:16 |
| GaryvdM | Hi Youssef | 08:17 |
| Youssef | it is about the bzr add command | 08:17 |
| Youssef | check this | 08:17 |
| Youssef | === modified file 'index.html' | 08:17 |
| Youssef | --- index.html 2009-05-13 11:38:13 +0000 | 08:17 |
| Youssef | +++ index.html 2009-05-22 19:18:00 +0000 | 08:17 |
| Youssef | @@ -1,1 +1,2 @@ | 08:17 |
| Youssef | Hello World!!! | 08:17 |
| Youssef | +"I'm a new line" | 08:17 |
| Youssef | what does mean @@ -1,1 +1,2 @@ | 08:18 |
| Peng_ | mwhudson: Serving a remote branch would be terribly inefficient, though. | 08:18 |
| bob2 | Youssef: it's a diff | 08:18 |
| Youssef | yes but | 08:19 |
| mwhudson | Peng_: pfff, such a boring objection | 08:19 |
| Peng_ | Youssef: That line shows the location of the change in the file. | 08:19 |
| bob2 | Youssef: it is indicating where in the file the edit is (line 1, in this case) | 08:19 |
| Youssef | but i see -1,1 +1,2 | 08:19 |
| Peng_ | mwhudson: :D | 08:19 |
| Peng_ | Youssef: And? | 08:20 |
| Youssef | precisly what is it | 08:20 |
| bob2 | Youssef: http://www.artima.com/weblogs/viewpost.jsp?thread=164293 | 08:20 |
| Youssef | bob2: Thanks | 08:21 |
| Youssef | guys im making a user guide of bzr for windows in french | 08:21 |
| Youssef | im contributing in hehe | 08:21 |
| igc | bbiab | 08:45 |
| * igc dinner - bbl | 08:57 | |
| === ja1 is now known as jam | ||
| GaryvdM | beuno: Got logerhead branched. ./serve-branches works. What was the other was to serve? | 10:03 |
| beuno | GaryvdM, ./start-loggerhead | 10:09 |
| beuno | but it's complicated | 10:09 |
| mwhudson | and the fix is 'bzr rm' | 10:10 |
| beuno | :) | 10:11 |
| beuno | soon | 10:11 |
| beuno | maybe this sprint | 10:11 |
| beuno | after this session | 10:11 |
| beuno | I'm hiding in the bzr room | 10:11 |
| beuno | find me a good place to hide | 10:11 |
| mwhudson | yeah, good luck with that | 10:11 |
| mwhudson | you can probably go behind the screen | 10:11 |
| GaryvdM | beuno: so ./server-branches is what I should use? | 10:13 |
| beuno | GaryvdM, yes | 10:13 |
| igc | bbiab | 10:37 |
| mwhudson | beuno: how outrageously booked are you today? | 10:54 |
| beuno | mwhudson, I'm on my way NOW | 10:54 |
| mwhudson | beuno: that's not actually an answer to my question :) | 10:54 |
| beuno | mwhudson, I will try to spend 50% of my time with you guys | 10:57 |
| beuno | at least 50% | 10:57 |
| mwhudson | beuno: cool | 10:57 |
| johnf | abentley: ping | 10:59 |
| poolie | hi igc? | 11:04 |
| poolie | igc: notes from our session in here http://bazaar.launchpad.net/~bzr/bzr/devnotes/changes | 11:05 |
| johnf | LarstiQ: ping | 11:11 |
| gkahla | hey folks - is bzr a good candidate for a small workgroup managing a set of OpenOffice.org documents and some maps in .jpg? I'm interested in how it deals w/ blobs. | 11:13 |
| Peng_ | gkahla: Current disk formats do line-based deltas, so storage efficiency might not be ideal, but it will work fine. | 11:19 |
| Peng_ | gkahla: Aside from that, you obviously won't get the benefit of looking at diffs, and merges will be more manual, but you can do it. | 11:20 |
| gkahla | Peng- it'll be a 4 ~ 5 person group, so merges are not critical | 11:20 |
| gkahla | i'll just smack the appropriate person with a hammer | 11:21 |
| gkahla | so long as I could "roll back" to a previous version of a given .odt, that's really all the functionality I need at this point. | 11:21 |
| gkahla | thanks for the feedback, Peng | 11:21 |
| jml | poolie: commit & push please | 11:22 |
| gkahla | thx folks - later | 11:23 |
| mwhudson | poolie: M-x insert-table >:) | 11:50 |
| johnf | lifeless: Just kept my side of the bargain. Patch for ppa.txt and tools/packaging/* just emailed | 12:06 |
| igc | poolie: thanks | 12:07 |
| igc | poolie, lifeless: I'm heading off for the night | 12:37 |
| jelmer | Hi Ian | 12:37 |
| jelmer | igc: g'night | 12:38 |
| igc | I've emailed the list with what I'm working on in case anyone wants to tweak those | 12:38 |
| jelmer | I think poolie and lifeless are still at lunch | 12:38 |
| igc | hi jelmer. How are you? | 12:38 |
| jelmer | Good! Sorry to hear you couldn't make it to the sprint. | 12:38 |
| igc | jelmer: me too! It would have been great to catch up | 12:39 |
| igc | jelmer: hope you're enjoying the sprint. I'll be back tomorrow. night | 12:40 |
| jelmer | igc: gnight | 12:41 |
| === abentley1 is now known as abentley | ||
| === abentley1 is now known as abentley | ||
| johnf | abentley: you back? | 13:45 |
| === Kissaki^0ff is now known as Kissaki | ||
| LarstiQ | johnf: pong | 14:29 |
| johnf | LarstiQ: will you have time to do create bzr-svn packages? | 14:30 |
| LarstiQ | johnf: there is a new bzr-svn version? | 14:31 |
| * LarstiQ looks at announce | 14:31 | |
| johnf | LarstiQ: I didn't see an annouonce but there is one on the web page | 14:31 |
| johnf | 0.6.1 | 14:31 |
| LarstiQ | johnf: it seems so | 14:33 |
| LarstiQ | jelmer: did you intentionally not announce bzr-svn 0.6.1 on bazaar-announce? | 14:33 |
| LarstiQ | johnf: I can do it in ~5 hours | 14:34 |
| LarstiQ | (start on it that is) | 14:34 |
| johnf | cool. I'm waiting on abentley to surface again so we can get a bzrtools release as well | 14:34 |
| LarstiQ | johnf: isn't everyone at UDS? | 14:34 |
| johnf | yes I think so | 14:35 |
| LarstiQ | except for us ;) | 14:35 |
| * fullermd is currently hacking around the missing bzrtools... | 14:37 | |
| GaryvdM | http://projects.serverzen.com/pm/p/cluemapper/wiki/ClueBzrServer | 14:40 |
| lifeless | poolie: ciao; leaving you my double-adapter as I recall your second power adapter doesn't fit the wall sockets. | 14:55 |
| * lifeless -> door | 14:56 | |
| spirov92 | hi guys, I've been looking at this: http://doc.bazaar-vcs.org/bzr.dev/en/user-guide/index.html#team-collaboration-distributed-style Which workflow do you think is recommended for web development? | 15:19 |
| spirov92 | btw hi KX | 15:22 |
| spirov92 | if I merge a feature branch into the trunk branch, can I delete the folder with the feature branch? | 15:36 |
| === tchan1 is now known as tchan | ||
| Peng_ | spirov92: If you want to. I don't, though. | 15:37 |
| bialix | helmer: hi | 15:37 |
| bialix | sorry | 15:37 |
| bialix | jelmer: hi | 15:37 |
| bialix | I've branched svn repo from http://projects.serverzen.com/pm/p/cluemapper/browser/ClueBzrServer/trunk | 15:38 |
| bialix | I can see the log of the branch | 15:38 |
| bialix | but when I'm trying to see diff I've got: NoSuchRevision: KnitPackRepository('file:///C:/Temp/ClueBzrServer/trunk/.bzr/repository/') has no revision rocky@serverzen.com-20090226184017-m3cemyrz487uxhg3 | 15:38 |
| bialix | jelmer: is it known problem or? | 15:39 |
| GaryvdM | Hi bialix | 16:22 |
| Peng_ | How should integration branches be used? When you want to, uh, integrate a branch, should you merge or pull it? | 16:50 |
| Peng_ | ISTM both are used by you guys. | 16:51 |
| Peng_ | What about "merge --pull"? | 16:52 |
| LarstiQ | Peng_: merge --pull is a shortcut for 'bzr pull. Oh, it failed, bzr merge.' | 16:57 |
| LarstiQ | Peng_: or 'bzr pull. It worked' in the other case | 16:57 |
| LarstiQ | Peng_: integrating will mean, I think, in most cases that the branches are diverged, which would mean merge | 16:58 |
| servilio | hi! is there a way to preserve the executable bit when committing to a subversion repository? | 17:46 |
| jml | servilio: you mean, using bzr-svn? | 18:12 |
| Peng_ | LarstiQ: On a slow-paced project, they may not be diverged. | 18:46 |
| servilio | jml: yes, using bzr-svn | 18:59 |
| LarstiQ | Peng_: ok, so what is your definition of an integration branch? | 19:00 |
| fullermd | The complement to a differentiation branch. Duh. | 19:01 |
| Peng_ | LarstiQ: I dunno. I've never used one. That's why I'm curious! :D | 19:01 |
| Peng_ | Heh. | 19:01 |
| Peng_ | Yes, that's a better answer. | 19:01 |
| LarstiQ | fullermd: and indeed, it is! | 19:01 |
| * fullermd is full of smart answers. Or smart _something_ answers, anyway... | 19:01 | |
| LarstiQ | to multiple differentation branches though. | 19:01 |
| ronny | yo | 19:02 |
| LarstiQ | Peng_: afaik/imo integration becomes interesting when there are multiple differentiation branches you want to incorporate. | 19:02 |
| ronny | anyone got a quick programmatic way to create a workdir with branch/repo | 19:02 |
| LarstiQ | Peng_: at the start one of them might not be diverged, but after that all of them are. | 19:02 |
| LarstiQ | ronny: bzrdir.sprout? | 19:02 |
| Peng_ | Ah. | 19:03 |
| LarstiQ | ronny: or BzrDir.create_branch_convenience? | 19:03 |
| ronny | LarstiQ: thats new, isnt it? its in my system | 19:03 |
| ronny | LarstiQ: something like that | 19:04 |
| ronny | LarstiQ: im just getting started with anyvc's repo/branch stuff | 19:04 |
| LarstiQ | ronny: lots of the creating/copying of different kind of bzr objects happens in bzrlib/bzrdir.py | 19:05 |
| Peng_ | Eh, I'm interested in integration branches because I'd like to make final tweaks to other peoples' branches, without putting them in the top level of history, and using one branch for it would be easier. :D | 19:05 |
| ronny | LarstiQ: the first looks cry terrrible complicated | 19:05 |
| LarstiQ | ronny: it is for if you have a bzrdir you want to branch of off (hence, sprouting a branch) | 19:06 |
| ronny | LarstiQ: i want to make a new one | 19:06 |
| ronny | ie create a fresh branch | 19:06 |
| LarstiQ | ronny: import bzrlib.bzrdir; bzrlib.bzrdir.BzrDir.create_branch_convenience('/tmp/new-branch') | 19:08 |
| LarstiQ | Peng_: 'top level of history'? | 19:09 |
| ronny | hmm | 19:09 |
| * LarstiQ goes get some dinner | 19:10 | |
| ronny | LarstiQ: ok, got it now, thanks | 19:13 |
| ronny | hmm, still the apis make me cry | 19:13 |
| Peng_ | LarstiQ: "bzr log -n 1" | 19:28 |
| LarstiQ | Peng_: hmm. | 19:30 |
| LarstiQ | Peng_: in some branch your tweaks will be there. Which one do you envision them not being? | 19:31 |
| LarstiQ | ronny: especially bzrdir has grown gnarly bits, yes | 19:31 |
| LarstiQ | ronny: I suppose your anyvc design will be close to what you'd like the interface to be? | 19:31 |
| Peng_ | LarstiQ: What do you mean? | 19:35 |
| LarstiQ | Peng_: I'm not clear on what you're aiming to do :) | 19:38 |
| Peng_ | Ehh. | 19:38 |
| LarstiQ | Peng_: if you say mirror brisbane-core, and then do a commit on top of that, yours will be the toplevel commit there | 19:38 |
| LarstiQ | so, there then has to be another branch you merge that into for it not to be? | 19:39 |
| Peng_ | I want to merge other peoples' branches into the trunk of whatever without polluting the "log -n 1" history with my random review bits and NEWS stuff. | 19:40 |
| Peng_ | I can make a branch of the other person's branch to do that, but it would be less hassle and overhead to just re-use one. | 19:40 |
| LarstiQ | ah | 19:42 |
| LarstiQ | Peng_: I see what you mean now. | 19:42 |
| ronny | LarstiQ: i'll try to get anyvc close to a nice interface | 19:42 |
| LarstiQ | Peng_: I don't know if there is a better term for that, but I'd call it a review branch or somesuch | 19:42 |
| ronny | LarstiQ: i will publish it as explicitly unstable api, then iterate till im nice with it | 19:43 |
| LarstiQ | ronny: alternatively, if you can articulate what makes you cry, maybe that can serve as input to reworking things | 19:43 |
| * LarstiQ nods at ronny | 19:43 | |
| LarstiQ | ronny: I do hope it will converge :) | 19:44 |
| ronny | LarstiQ: mostly the amount of words in method names, and the java-style layout of things | 19:45 |
| ronny | LarstiQ: its python, start to embrace that already | 19:45 |
| LarstiQ | ronny: it is python afaik | 19:46 |
| Peng_ | LarstiQ: OK, that term makes sense. What's an integration branch, then? | 19:46 |
| LarstiQ | Peng_: an analogue to the -mm linux tree | 19:46 |
| Peng_ | Ehh. | 19:47 |
| Peng_ | What about in the bzr project? | 19:47 |
| LarstiQ | ronny: in my experience with both, bzr code style looks nothing like java | 19:47 |
| ronny | LarstiQ: it still reminds me of many java patterns | 19:47 |
| LarstiQ | ronny: ok, since I don't see that, can you point out an example and how you would write it? | 19:48 |
| LarstiQ | Peng_: a branch that collects various other branches | 19:48 |
| LarstiQ | Peng_: say the old hpss one | 19:49 |
| LarstiQ | Peng_: trunk/bzr.dev also fit the integration bill, except (I) normally reserve that naming explicitly for non-trunk/pre-trunk staging | 19:50 |
| Peng_ | Okay. | 19:50 |
| LarstiQ | Peng_: the key as fullermd joked, is to bring together various topical pieces of work. | 19:50 |
| * Peng_ nods. | 19:50 | |
| ronny | LarstiQ: not sure, bascially get many of the classmethod/staticmethod factories out to some simple paces | 19:52 |
| ronny | LarstiQ: i'll know better after a few onyvc iterations | 19:53 |
| ronny | *anyvc | 19:53 |
| LarstiQ | ronny: ok | 19:53 |
| ronny | LarstiQ: im kinda scared by the amount of factories | 19:54 |
| LarstiQ | there are a lot of interfitting parts | 19:55 |
| ronny | LarstiQ: imho the api is just one order of magnitude too big, hg is a lot closer to what i consider good size of the api | 19:57 |
| Peng_ | Thanks for the info, LarstiQ. :) | 19:58 |
| ronny | well and git is close to what i consider reasons to stab people | 19:58 |
| fullermd | Who needs reasons? | 19:58 |
| ronny | people that like to act by reason | 19:58 |
| ronny | needing 3 subprocess calls and lots of guessing what they could have meant with those character combinations just for getting complete enough status data is well - generating hate | 19:59 |
| LarstiQ | ronny: what are you invoking with subprocess? | 20:01 |
| LarstiQ | surely git can't be that convoluted? | 20:02 |
| LarstiQ | I hope? | 20:02 |
| ronny | LarstiQ: ls-tree -r head, ls-files -c -<some more> and ls-files -<some others> | 20:02 |
| ronny | LarstiQ: i need workdir, index and tree data to infer status | 20:02 |
| ronny | LarstiQ: git is a major pain | 20:02 |
| === krisfree is now known as krisfremen | ||
| Peng_ | bzr-git? | 20:05 |
| Peng_ | Or dulwich directly? | 20:05 |
| LarstiQ | ronny: right, as Peng_ said, would working with the datastructures directly be less painful? | 20:06 |
| ronny | Peng_: dulwich is incomplete for the task | 20:09 |
| ronny | and semms to be weird | 20:09 |
| ronny | +bzr-git | 20:09 |
| ronny | LarstiQ: also bzr isnt supposed to become a mandatory dependency | 20:29 |
| LarstiQ | ronny: I agree. If I implied it should that is not what I intended. | 20:30 |
| ronny | LarstiQ: well, also supporting the vcs implementations of bzr is probably a good thing | 20:33 |
| ronny | but its not supposed to be the main backend implemenations for other vcs's | 20:33 |
| ronny | more like nice to have fallbacks | 20:33 |
| LarstiQ | ah ok | 20:33 |
| vxnick | is there any way I can store the revno in a file, preferably with a hook? I'm guessing a post_commit hook wouldn't work as the revno file would then be outside the current revision? | 20:37 |
| vxnick | I use bzr-upload once committed if that makes any difference | 20:37 |
| pygi | hi hi | 20:38 |
| pygi | ronny: you're again talking about anyvc? | 20:38 |
| ronny | pygi: yeah, finally started with the repository/history stuff | 20:38 |
| ronny | after some killing fun with git | 20:39 |
| LarstiQ | vxnick: `bzr version-info`? | 20:39 |
| Peng_ | vxnick: Looking for svn-like keywords? | 20:39 |
| vxnick | LarstiQ: ideally I'd like to do it as part of the commit so bzr-upload uploads it to the server with the rest of the changes | 20:39 |
| vxnick | Peng_: that's a good point, there's a plugin for that isn't there? | 20:40 |
| Peng_ | vxnick: Yep. | 20:40 |
| LarstiQ | vxnick: hmm hmm, I guess bzr-upload might have/need support for a processing step prior to deployment | 20:40 |
| vxnick | slightly annoying as it uploads a .bzr-upload-revid file, but that doesn't contain the revno >.< | 20:41 |
| LarstiQ | vxnick: it has the revid though ;P | 20:41 |
| vxnick | true, but I need the revno for various bits | 20:42 |
| ronny | hmm | 20:43 |
| vxnick | clients prefer a nice readable number ;) | 20:43 |
| ronny | anyone aware of a quick way to ask for the amount of revisions in a branch | 20:43 |
| LarstiQ | ronny: mainline, or all? | 20:43 |
| ronny | LarstiQ: all | 20:44 |
| ronny | LarstiQ: im not not sure if i should like or hate the mainline feature | 20:44 |
| LarstiQ | ronny: like ;) | 20:44 |
| ronny | LarstiQ: its your right to like it, its mine to evaluate before i decide how much i hate it | 20:45 |
| * LarstiQ nods | 20:45 | |
| ronny | hmm | 20:45 |
| LarstiQ | ronny: I seriously dislike not having it in hg/git | 20:45 |
| ronny | LarstiQ: im wondering if i sould ad it to anyvc | 20:45 |
| ronny | it a adapter that views mainlines and pushes merges/branches kind of away | 20:46 |
| Peng_ | Quick in what way? Counting the number of revisions would probably be a full-history operation. | 20:46 |
| ronny | Peng_: in hg its O(1) | 20:47 |
| ronny | in svn its O(1) | 20:47 |
| ronny | in git/bzr i might have to cache | 20:47 |
| LarstiQ | are you sure about svn, now that it has some form of merging? | 20:48 |
| Peng_ | How's it O(1) in svn? | 20:48 |
| ronny | LarstiQ: svn still has linear revision numbers | 20:48 |
| LarstiQ | ronny: not entirely | 20:48 |
| Peng_ | Sure, the current revno is the total number of revisions in the repo, but not the current branch. | 20:48 |
| LarstiQ | ronny: you can switch heads away from branches in svn | 20:48 |
| LarstiQ | ronny: but still include revisions as merged | 20:49 |
| LarstiQ | that aren'y linearly visible in svn log | 20:49 |
| ronny | oh damn | 20:49 |
| ronny | hmm, svn really does everything to suck in hellish ways | 20:49 |
| LarstiQ | ronny: I'll give you it doesn't occur much, since svn itself can't really display it nicely | 20:49 |
| Peng_ | ronny: Well duh. What kind of successor would it be to CVS otherwise? :D | 20:52 |
| * LarstiQ stares at the thunder and hailstorm outside. | 20:53 | |
| ronny | hmm | 20:53 |
| ronny | i'll certainly use subvertpy for my svn stuff tho | 20:53 |
| LarstiQ | aronny: len(branch.repository.get_ancestry(branch.last_revision()) | 20:53 |
| LarstiQ | ronny: quite a bit slower than branch.last_revision_info() | 20:54 |
| ronny | LarstiQ: will that make a list? | 20:54 |
| LarstiQ | ronny: yeah | 20:54 |
| ronny | ew | 20:54 |
| ronny | hmm | 20:54 |
| ronny | seems like hg is the only one able to give me O(1) there | 20:54 |
| LarstiQ | last_revision_info() on the other hand will read a number from disk | 20:54 |
| LarstiQ | and is O(1) | 20:55 |
| ronny | hmm, waht is last_revision_info? | 20:55 |
| LarstiQ | ronny: revid, revno tuple | 20:55 |
| LarstiQ | oh, other order | 20:55 |
| LarstiQ | ronny: so yeah, mainline | 20:56 |
| ronny | hmk | 20:57 |
| ronny | hmm, well, hg is better at whole repo ops | 20:57 |
| ronny | mainlines would be expensive there | 20:58 |
| LarstiQ | ronny: yeah, hg's repository plays a role more on the frontlines | 20:59 |
| ronny | hmm, i developed a general preference for hg, it does things more simple and faster | 21:00 |
| LarstiQ | there is something to be said for that | 21:00 |
| * LarstiQ still has to get to grips with it's ui | 21:00 | |
| ronny | some things about mq are a bit unfortunate, but thats about it | 21:03 |
| ronny | hg's codebase it a lot better for getting into it than bzr's | 21:04 |
| jelmer | ronny: hi | 21:27 |
| jelmer | ronny: what's weird about dulwich? | 21:28 |
| LarstiQ | I think he meant bzr-git is weird | 21:28 |
| jelmer | ah, ok | 21:31 |
| ronny | jelmer: dulwich is pretty ok, just not yet ready for my needs | 21:35 |
| ronny | jelmer: bzr-git is well, wkinda weird | 21:35 |
| LarstiQ | ronny: weird for anyvc to use? (I'd agree on principal) or weird in general? (I don't know the code) | 21:37 |
| pygi | hi jelmer, poolie | 21:39 |
| pygi | others :) | 21:39 |
| ronny | LarstiQ: weird in general, when i last tried it with bzr it was all weird | 21:39 |
| LarstiQ | ronny: k | 21:42 |
| LarstiQ | hi jelmer, pygi, poolie1 | 21:42 |
| LarstiQ | this was the first day? | 21:42 |
| pygi | LarstiQ: yup | 21:42 |
| LarstiQ | how was it? | 21:42 |
| pygi | pretty good, I even got some work done :P | 21:43 |
| pygi | too bad windows is so broken, so there are all sorta weird bugs :-/ | 21:43 |
| poolie1 | hello LarstiQ, it was good | 21:44 |
| LarstiQ | pygi, poolie1: good to hear | 21:44 |
| * LarstiQ wouldn't mind a blog post ;) | 21:44 | |
| pygi | LarstiQ: I think poolie microblogged everything | 21:45 |
| pygi | does that counts? :p | 21:45 |
| Peng_ | Oh? URL? | 21:46 |
| LarstiQ | pygi: maybe if I knew where to find that :P | 21:46 |
| Peng_ | (Eh, I guess that's what the search pages are for.) | 21:46 |
| pygi | LarstiQ: http://twitter.com/sourcefrog | 21:47 |
| LarstiQ | pygi: thanks. I wonder if I could fit this into identi.ca somehow | 21:49 |
| pygi | LarstiQ: he also has an identi.ca acc :P | 21:50 |
| Peng_ | http://identi.ca/sourcefrog fwiw | 21:53 |
| * LarstiQ subscribed | 21:55 | |
| LarstiQ | sigh, I botched that slightly | 22:06 |
| * LarstiQ goes to bed | 22:06 | |
| jelmer | ronny: ah, right | 22:11 |
| jelmer | ronny: bzr-git is about as weird as hg-git I would expect :-) | 22:11 |
| jelmer | ronny: The working tree status update stuff will be introduced at some point, when I get around to improving the speed of "bzr st" | 22:12 |
| * knielsen hopes this bug doesn't mean our trees are corrupted: https://bugs.launchpad.net/bzr/+bug/375898 | 22:13 | |
| ubottu | Ubuntu bug 375898 in bzr "bzr merge fails: bzr: ERROR: No final name for trans_id 'new-1'" [Undecided,New] | 22:13 |
| jelmer | knielsen: I think I have seen that bug report before somewhere | 22:14 |
| ronny | jelmer: not sure, hg git seems to do fine as it doesnt enable support for git workdirs/repos, just communication to them | 22:15 |
| ronny | at least thats my understanding | 22:15 |
| jelmer | ronny: How is that less weird though/ | 22:20 |
| jelmer | ? | 22:20 |
| ronny | jelmer: the really weird behaviour i kinda saw was when running bzr commands within a git dir, i cant recall it atm and i wont reinstall | 22:30 |
| ronny | hmm | 22:30 |
| ronny | is there a way to use bzrdir create_branch_convience and get a branch back? | 22:31 |
| ronny | or should i just add an extra open_containing? | 22:31 |
| === Kissaki is now known as Kissaki^0ff | ||
| igc | morning | 23:38 |
| jelmer | hi Ian | 23:52 |
Generated by irclog2html.py 2.7 by Marius Gedminas - find it at mg.pov.lt!