| enigma42 | jelmer: Are the "bzr:file-ids" and "bzr:text-revisions" old meta-data properties? | 00:21 |
|---|---|---|
| jelmer | enigma42, the file properties you mean? | 00:21 |
| enigma42 | Yeah. They are file properties of the svn directory that contains the project. | 00:21 |
| jelmer | enigma42, they are used by both bzr-svn 0.4 and 0.5 if you are not using svn 1.5 on the client and server | 00:22 |
| enigma42 | I tracked down that "missing" ID that I pasted earlier. | 00:22 |
| enigma42 | That ID that is being reported as "missing" is set in bzr:text-parents for the project I'm working with. | 00:22 |
| enigma42 | ack. | 00:23 |
| enigma42 | I mean "bzr:text-revisions" | 00:23 |
| enigma42 | NOT "bzr:text-parents" | 00:23 |
| enigma42 | jelmer: Sorry. Pidgin melted down and I lost my connection. | 00:25 |
| enigma42 | jelmer: Anyway...I found that problem id in "bzr:text-revisions" file property. | 00:26 |
| enigma42 | I'm wondering what would happen if I deleted the file property and committed that back in. | 00:26 |
| jelmer | enigma42, it may help, but not guarantees bzr-svn won't look at the file properties in older revisions | 00:28 |
| jelmer | s/not/no | 00:28 |
| enigma42 | OK. So, at best, the change would only work from the current revision onward. | 00:29 |
| lifeless | spm: can you add markh as a committer to the bzr pqm please | 01:06 |
| spm | lifeless: sure | 01:06 |
| lifeless | thanks | 01:07 |
| spm | lifeless: is done | 01:14 |
| lifeless | markh: ^ | 01:14 |
| lifeless | markh: there is setup info in the dev guide | 01:14 |
| markh | lifeless, spm: excellent, thanks. | 01:15 |
| spm | markh: it's against your @skippinet address fwiw | 01:15 |
| markh | excellent, thanks. Will it see that address in a "reply-to"? | 01:16 |
| markh | (I subscribe to the mailing list via a gmail acct) | 01:16 |
| lifeless | markh: the mailing list is unrelated | 01:16 |
| markh | oh - I thought maybe to pick up votes... | 01:17 |
| lifeless | markh: this is for sending commits to the trunk, not for voting | 01:17 |
| markh | ok, gotchya - thx | 01:17 |
| markh | I'll read that guide as soon as I finish this little distraction I'm working on... | 01:17 |
| rocky | where does bzr save the backups after a "bzr revert" ? | 01:32 |
| james_w | rocky: in tree, as .~1~ files | 01:32 |
| james_w | then .~2~ if there is a .~1~ etc. | 01:33 |
| rocky | thx | 01:34 |
| GNUcious | hello all... | 01:35 |
| mrooney | Is there a way to authenticate with bzr-svn? When I do a checkout from the svn repository normally, it asks me for my password. But trying to branch it with bzr just gives me Errno 111 Connection Refused. | 01:36 |
| markh | lifeless: you referring to the "Core Developer Tasks" section in that guide? | 01:39 |
| mwhudson | mrooney: connection refused doesn't sound like a failed authentication | 01:39 |
| mrooney | Ahh, and if I try http:// instead of svn:// I get "Unable to handle http code 401: Authorization Required" | 01:39 |
| mrooney | mwhudson: okay well what about that? :) | 01:39 |
| mwhudson | that sounds more likely, yes :) | 01:40 |
| jelmer | mrooney, try svn+http:// | 01:41 |
| mwhudson | ah hi jelmer | 01:42 |
| mwhudson | :) | 01:42 |
| * mwhudson stops trying to google this | 01:42 | |
| jelmer | hey Michael :-) | 01:42 |
| mrooney | jelmer: thanks, that seems to be doing something! Although it says the svn+ syntax is deprecated. | 01:45 |
| jelmer | mrooney, that's correct, it will go away at some point in the future | 01:51 |
| jelmer | mrooney, without "svn+" doesn't work atm because of a bug in bzr | 01:52 |
| mrooney | jelmer: oh, so which (svn:// or http://) will work when it becomes removed? | 01:52 |
| jelmer | mrooney, svn:// and http:// are different beasts | 01:52 |
| jelmer | mrooney, svn:// is for use with the svnserve daemon on the server side | 01:53 |
| jelmer | mrooney, http:// is for an http server on the server side | 01:53 |
| jelmer | mrooney, svn+http:// will disappear and be replaced by a properly working http:// | 01:53 |
| mrooney | jelmer: okay, I have branched it which was super slick. Now I have committed and want to push, but I am not sure how to tell it my username (it isn't my unix username) | 01:54 |
| jelmer | mrooney, it should prompt you | 01:54 |
| mrooney | jelmer: it prompts for the password for my unix username | 01:55 |
| mrooney | but that doesn't work since my unix username isn't a user on the repo, alas | 01:55 |
| jelmer | mrooney, you should be able to use http://username@host/../ in the URL | 01:55 |
| mrooney | oh yes that seems wise :) | 01:55 |
| * mrooney hugs jelmer | 01:56 | |
| mrooney | thanks! | 01:56 |
| jelmer | np | 01:56 |
| mrooney | this is way more transparent than I expected, good job everyone who worked on bzr-svn! | 01:56 |
| === Mario__ is now known as pygi | ||
| === mr-rus1 is now known as mr-russ | ||
| === Mario__ is now known as pygi | ||
| lifeless | ok, thats a day for me | 05:15 |
| lifeless | ciao | 05:15 |
| tsculpt | hello | 05:30 |
| mi3 | Hello, this is more of a general VCS question: what is the usual way to include code from other projects in your project? Would you just put it in a subdirectory and ignore it with .bzrignore? Also, what if it uses its own version control system? | 05:49 |
| RAOF | mi3: Generally, people do _not_ include code from other projects. | 05:50 |
| RAOF | You could put it in a subdir and ignore it; as far as I'm aware, there are plans for bzr to support the 'checkout of other bzr repository in this directory' concept, too. | 05:52 |
| mi3 | RAOF: So if I was borrowing code from an LGPL project and including it in my GPL project, I would generally exclude any code from the other project in version-tracking for my own. That makes sense now that I think about it | 05:53 |
| RAOF | What LGPL project? It's generally frowned upon to actually include the source of another project in your own (if you could possibly link to it). | 05:57 |
| billam | If a branch gets copied (cp -r) to another spot and separate changes are made to both and committed, is there anyway to merge them back together? | 05:57 |
| billam | Each thinks there are no new revisions to merge. | 05:58 |
| mi3 | RAOF: the situation is that I am including some LGPL code I wrote in one project, in another project (which will be GPL). It is all written in PHP, and will essentially rely on 'include' statements for the linking. When distributing it I want to distribute the whole thing, rather than have users have to download two parts from different locations. If you can suggest improvements to how I'm doing it I'd be interested to hear | 05:59 |
| RAOF | billam: works here; I copied a branch to foo-1 and foo-2, added different things to each, committed to each, then merged foo-1 into foo-2 | 06:01 |
| RAOF | mi3: I guess it depends on what the older project was. If it's some form of library which is useful outside the new project, it might deserve to be shipped seperately. If no one else is interested in the old project, you can do what you want ;) | 06:03 |
| RAOF | billam: How exactly were you trying to merge them? | 06:03 |
| mi3 | RAOF: The shared part is a library that may be useful for my own future projects. Thinking out loud here... I guess it is similar to how several Mozilla projects include gecko code, or thousands of projects include GTK+ code. hmm | 06:12 |
| RAOF | Please don't model on the gecko code; that's horrible to embed :) | 06:13 |
| RAOF | You are of course free to do what you want. Just bear in mind that if you've got a bunch of shared code across projects it makes most sense to factor it out as a library, and ship it separately. | 06:14 |
| mi3 | hehe, well the analogy really doesn't go too far. If the gecko code is a car, then my library would be a single hub cap | 06:15 |
| mi3 | Thanks for your help | 06:15 |
| RAOF | Once it's in a distro the package manager takes care of the dependencies. And many distros will frown on code duplication, and packagers will curse your name :). | 06:15 |
| mi3 | ah yep I see. I guess if it were ever to be packaged for a distro then it could be configured to all point to a separate central library. I think my concern was how I was going to manage the source code, and I think I have my answer - that the app is project A, the library it's using is project B, and the two shall not be combined into a branch | 06:18 |
| mi3 | so that the same bit of source code is not version tracked in two different projects | 06:20 |
| RAOF | That will probably make things easier, yeah. | 06:21 |
| mi3 | and I would have the option of distributing it separately too | 06:21 |
| mi3 | thx | 06:21 |
| billam | RAOF, thank you for checking for me. I was using an improper path, works fine with the correct path. | 06:36 |
| vila | hi all | 06:56 |
| === k4v is now known as m4v | ||
| igc | night | 09:55 |
| james_w | night igc | 10:00 |
| Jc2k | morning | 10:14 |
| === asabil_ is now known as asabil | ||
| LarstiQ | jelmer: is there a init.d variant for loggerhead serve-branches? | 12:01 |
| Jc2k | does bazaar have any per repository configuration | 13:00 |
| james_w | Jc2k: only locations.conf | 13:01 |
| james_w | so not really | 13:01 |
| Jc2k | james_w: oh, fail | 13:01 |
| Jc2k | james_w: and locations.conf can't really be shared between users? | 13:04 |
| james_w | no, it can't | 13:04 |
| Jc2k | bugger :) | 13:04 |
| james_w | there's nothing that is sticky to the branch or to the repository | 13:04 |
| fullermd | Sure it can! You just make it a FIFO with a perl script on the other end, see... | 13:05 |
| LarstiQ | well, there is .bzr/branch/branch.conf | 13:05 |
| LarstiQ | but that won't be copied verbatim | 13:05 |
| Jc2k | so i'd like to have some things configured per repository, mostly hooks | 13:06 |
| Jc2k | any branches in foo repository should email-on-commit | 13:06 |
| Jc2k | but not in the bar repository | 13:06 |
| Jc2k | and the email address might be different per repository, too | 13:06 |
| Jc2k | locations.conf *could* work, but there are multiple users | 13:07 |
| LarstiQ | Jc2k: not sure if this is what you want, but what about lp:bzr-hookless-email? | 13:07 |
| Jc2k | email was just an example, i'd want to hack bzr-cia to be set-up-able per repo too | 13:08 |
| Jc2k | and likely other random things | 13:08 |
| Jc2k | in pre-change-branch-tip, i could take params.branch.repository.base and look for my own file, but that feels like complete gash | 13:09 |
| Jc2k | (more post than pre, FWIW) | 13:10 |
| loxs | folks, I have a repository bla/ with branches in it like bla/1.0.0, bla/1.0.1 etc. Now we are releasing new major release (2.0). Is it OK if I create a directory inside bla/ and move the branches from the 1.0 series to it? | 13:21 |
| beuno | loxs, this is a shared repo you have in bla/ then? if it is, then yes | 13:22 |
| andrea-bs | Hello! Please, can somebody put bzrtools 1.11 to bzr-beta-ppa? | 13:22 |
| loxs | beuno, yes, it's a shared repo | 13:22 |
| loxs | beuno, so nothing will go wrong if I move the branches in such a way? | 13:23 |
| beuno | loxs, not at all | 13:23 |
| beuno | bzr will find the revisions | 13:23 |
| loxs | thanks | 13:23 |
| LarstiQ | just don't move the branches outside of their repository | 13:24 |
| fatcnt | Hi guys. :-) | 13:30 |
| fatcnt | I am new to bzr, and just wondering why bzr push --create-prefix bzr+ssh://alex@slice.gaww.net/home/alex/bzr/misc just publishes an empty directory | 13:37 |
| fatcnt | from the same directory bzr log & bzr ls indicate both revisions and files | 13:37 |
| beuno | fatcnt, is it empty, or does it have a .bzr file? | 13:38 |
| fatcnt | drwxr-xr-x 8 alex staff 272 Jan 14 00:23 .bzr | 13:38 |
| beuno | bzr doesn't create working trees remotely | 13:38 |
| beuno | so all your data is in the .bzr dir | 13:38 |
| fatcnt | :/ | 13:38 |
| fatcnt | the howto indicates this is possible | 13:39 |
| beuno | you can 2 plugins to create the working tree remotely: push-and-update, or, if you don't need bzr's metadata remotely (ie, a website) bzr-upload | 13:39 |
| fatcnt | $ bzr push --create-prefix sftp://your.name@example.com/~/public_html/myproject | 13:39 |
| fatcnt | 2 revision(s) pushed. | 13:39 |
| fatcnt | ah, okay. I need plugins. cool. | 13:39 |
| fatcnt | Or, I could just rsync it all up. That might be more effeicent too, right? | 13:40 |
| fatcnt | How does bzr handle symlinks? | 13:42 |
| beuno | fatcnt, well, bzr isn't very rsync-friendly, but you can do that too | 13:42 |
| fatcnt | ait | 13:44 |
| fatcnt | I just need to bzr update? | 13:44 |
| === Mario__ is now known as pygi | ||
| phinze | is it bzr that's creating these foo.ext.~1~ files? | 15:16 |
| jelmer | phinze, yes, when you "bzr revert" a file | 15:23 |
| jelmer | phinze, the --no-backup option will prevent it from doing that | 15:23 |
| phinze | jelmer: gotchya, thanks | 15:24 |
| kinkie | Hi all.. quick question (I hope). Is it possible (directly or via some plugin) to perform content replacement in checked-out files a la RCS "$Id$"? Thanks! | 15:32 |
| jelmer | hi kinkie | 15:36 |
| jelmer | kinkie, there's some work happening at the moment to support that, not sure how much of it will end up in 1.11 | 15:36 |
| jelmer | igc, ^ | 15:36 |
| === sabdfl1 is now known as sabdfl | ||
| kinkie | jelmer: I'm not in a hurry. I'm just happy it's in the roadmap. Useful to put a snapshot date in the debugging output to a developing project. | 15:37 |
| kinkie | Thanks | 15:37 |
| === eaumontab is now known as abeaumont | ||
| beuno | jam, hi! from what I've been reading, revnos are always calculated, and never stored. Is that interepretation correct? | 16:19 |
| jam | beuno: ATM, yes | 16:20 |
| beuno | jam, aha! So finally I understand why it's so expensive :) | 16:20 |
| beuno | thanks for the confirmation | 16:20 |
| jam | They technically vary based on the branch tip | 16:21 |
| jam | though with some stability guarantees based on how the ancestry actually would change | 16:21 |
| beuno | we do save the last_revno, right? | 16:21 |
| beuno | and go from there down? | 16:21 |
| jam | Right | 16:21 |
| jam | yep | 16:21 |
| jam | (Though I consider time to flow downward :) | 16:22 |
| jam | most of the time, at least | 16:22 |
| beuno | intersting, a lot of emails now make *so* much more sense | 16:22 |
| phinze | jam: time flowing downward? such the pessimist! | 16:23 |
| beuno | in muy head, tip == top | 16:23 |
| jam | beuno: I *always* do 'bzr log --forward' | 16:23 |
| jam | Considering my "bzr commit" | 16:24 |
| beuno | so it *has* to flow downward | 16:24 |
| jam | and my shell time goes downward | 16:24 |
| jam | the command I wrote earlier is above the current one | 16:24 |
| jam | I think "bzr log"'s default mode is an ugly hack because we don't know how many revisions the person wants | 16:24 |
| jam | but we know they generally want the newest ones | 16:24 |
| jam | (and it is consistent with all other programs that do that sort of thing) | 16:24 |
| jam | but --forward is much more "logical" IMO | 16:24 |
| jam | I realize that HTML pages (blog posting) etc work differently | 16:25 |
| jam | as you expect old things to get pushed off the bottom of the page, to keep new stuff showing up first | 16:25 |
| beuno | right, now we write it literally as a "log" | 16:25 |
| jam | Certainly if you read a book, though | 16:25 |
| jam | time goes "down" | 16:25 |
| jam | Rarely does the next paragraph come before the previous | 16:26 |
| beuno | although listings ordered by date can be expected in either order, depending on the relevance of the "newer" data | 16:26 |
| beuno | if the terminal didn't scroll, then the current way is fine | 16:27 |
| jam | beuno: and whether the arrow points up or down, right? | 16:27 |
| beuno | right | 16:27 |
| beuno | I think I'd still have a hard time for a while re-mapping the time flow in my head | 16:27 |
| jam | beuno: well people expect to do "$VCS log | less" | 16:27 |
| beuno | but it's worth experimenting the change with an alias | 16:27 |
| jam | beuno: I would recommend "bzr alias log='log --short --forward -r-10..-1'" | 16:28 |
| jam | It is what I use everywhere | 16:28 |
| jam | I can always do "bzr log -r XXX" if I need more, or do "bzr log --no-aliases" | 16:28 |
| beuno | jam, will try it out for a week and see how my happiness levels differ | 16:28 |
| jam | but it gives me about 1 screenful of information | 16:28 |
| jam | without scrolling | 16:28 |
| jam | and giving the summary of what has been happening | 16:28 |
| beuno | aaah, I forget how fast --short is... | 16:29 |
| * awilkins just uses bzr qlog | 16:30 | |
| awilkins | But I'm evil | 16:30 |
| jam | beuno: and "bzr log --short -r -10..-1" is multitudes faster than 'bzr log' | 16:30 |
| jam | as in 4s versus 0.4s for bzr.dev on my machine | 16:31 |
| beuno | jam, incredibly so. I never realized the big difference | 16:31 |
| jam | beuno: well, I've personally made sure that bzr log --short -r -10..-1 is fast | 16:31 |
| jam | as a) I use it all the time | 16:31 |
| jam | and b) it is *possible* for it to be fast | 16:31 |
| jam | as it doesn't depend on big history data | 16:31 |
| beuno | right, no dotted revnos | 16:31 |
| jam | yep, and we can find -10 by just walking back 10 revs from the tip | 16:32 |
| jam | I don't know about other people, but I generally have a "My mind is thinking and hands are idle, so I'll type something" commands | 16:33 |
| jam | It used to be 'ls' | 16:33 |
| jam | it is now either "bzr st" or "bzr log" | 16:33 |
| beuno | right, if bzr log is that cheap, it's absolutely more informative than ls | 16:34 |
| beuno | it's amazing how a second or two changes your behaviour completely | 16:34 |
| jam | yep | 16:34 |
| jam | It goes into the "without thinking about it" timespace | 16:34 |
| jam | versus "waiting for it, and switching context" | 16:34 |
| jam | For TDD they give the threshold as about 10s | 16:35 |
| jam | that >10s you will go look at something else | 16:35 |
| jam | which will destroy your TDD cycling | 16:35 |
| enigma42 | Does anyone know if there is a way to have dpush create a new branch? | 16:47 |
| enigma42 | If not, how do I get a branch started so I can "dpush" the rest? | 16:47 |
| === Spaz is now known as Kittens | ||
| jelmer | james_w, ping | 17:14 |
| enigma42 | jelmer: Is there a way to get "dpush" to create a new branch? | 17:15 |
| jelmer | I think it should already be able to create new branches | 17:15 |
| enigma42 | I get "not a branch" errors. | 17:16 |
| james_w | hey jelmer | 17:22 |
| === beaumonta is now known as abeaumont | ||
| Lo-lan-do | Hi all | 17:46 |
| === asac_ is now known as asac | ||
| Lo-lan-do | I'm trying out bzr and bzr-svn from Debian experimental (as opposed to the versions from unstable), and I'm having a few questions. | 17:47 |
| jelmer | enigma42, Please file a bug | 17:47 |
| jelmer | Lo-lan-do, hi | 17:47 |
| Lo-lan-do | First, when I run bzr ls svn+https://svn.gforge.org/svn/gforge/trunk, I get a warning that I should use https://.../trunk instead. | 17:48 |
| jelmer | Lo-lan-do, I was about to go to dinner, but please ask anyway, I'll be back in ~30 min | 17:48 |
| Lo-lan-do | ...but when I do that, I get error: (51, "SSL: certificate subject name (gforge.com) does not match target host name 'svn.gforge.org'") | 17:48 |
| Lo-lan-do | Hi jelmer | 17:48 |
| Lo-lan-do | I'll probably pester you later on, I'll go to dinner soonish too :-) | 17:49 |
| enigma42 | jelmer: I filed a bug and included steps to reproduce it: https://bugs.staging.launchpad.net/bzr-svn/+bug/316205 | 18:05 |
| ubottu | Ubuntu bug 316205 in debian-installer "Regression: USB/Wireless keyboards not working on Jaunty alternate daily CD - from Alpha 2" [Undecided,New] | 18:05 |
| enigma42 | jelmer: Thanks again for all your help. :-D | 18:05 |
| enigma42 | Hm...it looks like ubottu grabbed the wrong bug. ;-) | 18:06 |
| jelmer | Lo-lan-do, that's correct, it's a known bug in bzr | 18:09 |
| bitner | http://launchpad.net/bzr-xmloutput/trunk/0.8.2/+download/bzr-xmloutput-setup-0.8.2.exe does not seem to give me a usable windows executable, does this work for anyone or is my firewall bungling something up -- the file I get is 24.5k | 18:18 |
| bitner | error I get \\mypath\bzr-xmloutput-setup-0.8.2.exe is not a valid Win32 application. | 18:20 |
| jelmer | enigma42, thanks | 18:29 |
| NfNitLoop | bitner: is there a particular reason you need the 0.8.2 vers... oh, xmloutput. duh. | 18:30 |
| NfNitLoop | Hmmm. | 18:30 |
| NfNitLoop | unfortunately, I don't have a windows box handy to test that on. | 18:31 |
| Lo-lan-do | bitner: I get a 116K file with wget | 18:41 |
| bitner | hrmmmmmm | 18:41 |
| bitner | @#$ firewall | 18:41 |
| Lo-lan-do | jelmer: Any known workaround, or shall I stay with svn+https:// instead? | 18:41 |
| Lo-lan-do | jelmer: Also, a simple bzr update just took 28 minutes, mostly spent in "determining changes". | 18:43 |
| Lo-lan-do | I'm running it again, in case it was due to some cache being refreshed for the 0.5 version, but it seems to be not much faster. | 18:45 |
| kfogel | in bzrlib/status.py:_raise_if_nonexistent(), I'm trying to figure out why old_tree and new_tree params have those names instead of, say, inventory and working_tree. | 18:48 |
| kfogel | Is there any reason why the more general names are significant? | 18:48 |
| james_w | you can take the status between any two trees | 18:58 |
| james_w | is that function only for working trees and their basis? | 18:58 |
| mrooney | enigma42: it looks like you filed your bug in staging? That won't stick at all, will it? | 19:15 |
| === mtaylor_ is now known as mtaylor | ||
| sabdfl | folks | 19:39 |
| sabdfl | did status just get substantially faster on large trees? | 19:39 |
| sabdfl | in brisbane-core? | 19:39 |
| sabdfl | like, MUCH faster? 20%? | 19:40 |
| sabdfl | or is this an artifact of something else in my tests? | 19:40 |
| jam | sabdfl: in brisbane-core what revisions are you comparing against? I don't know of any specific work on status, though if your -core was a bit old I've been merging in bzr.dev periodically. | 19:43 |
| jam | My first guess would be that you compiled the bzr.dev extensions | 19:43 |
| jam | which would have an impact | 19:43 |
| sabdfl | no, my test script always does that | 19:44 |
| Lo-lan-do | Hm. 33 minutes to commit a single-line patch. Not everything goes faster as time passes :-) | 19:44 |
| Lo-lan-do | jelmer: Will you be at FOSDEM? | 19:45 |
| Lo-lan-do | jelmer: If so, maybe I could entertain you for a couple of beers, and you could maybe diagnose what I keep doing wrong... | 19:47 |
| jam | Lo-lan-do: are you sure all extensions are compiled? Certainly 33min is rather excessive | 19:55 |
| Lo-lan-do | jam: This is on a branch bound to an SVN repo. Most of the time is spent in the network. *Lots* of https connections. | 19:56 |
| LarstiQ | Lo-lan-do: jelmer will be at fosdem | 20:00 |
| jelmer | Lo-lan-do, yep, I'll be at FOSDEM | 20:02 |
| * LarstiQ has a hotel booking, but still has to see if he can stand upright | 20:02 | |
| jelmer | LarstiQ, flu? | 20:03 |
| LarstiQ | jelmer: yeah | 20:03 |
| LarstiQ | jelmer: I'm back at work, but not being able to understand people is a hint I'm not entirely fit yet. Also, the coughing and snot. | 20:04 |
| jelmer | ah :-/ | 20:04 |
| Lo-lan-do | jelmer: Expect to be cajoled :-) | 20:09 |
| thumper | jelmer: hi | 20:09 |
| thumper | jelmer: what's the current usability status of svn-server? | 20:10 |
| thumper | s/server/serve/ | 20:10 |
| jelmer | Lo-lan-do, :-) | 20:10 |
| jelmer | thumper, pretty much the same as last time you asked :-) | 20:10 |
| thumper | :) | 20:10 |
| eleftherios | what is the name of that web-based bzr browser that is build with Paste. I think the name has something to do with turtle.. | 20:11 |
| jelmer | thumper, in other words, a proof-of-concept basically. It doesn't support incremental updates yet, nor commits | 20:11 |
| thumper | ok | 20:11 |
| thumper | eleftherios: loggerhead | 20:11 |
| jelmer | thumper, most of the underlying logic is there already (required for the rest of bzr-svn), but the protocol code isn't there | 20:12 |
| eleftherios | thumper: ah thanks! | 20:12 |
| thumper | jelmer: is the protocol complicated? | 20:12 |
| jelmer | thumper, no, it's not too bad | 20:12 |
| mwhudson | morning | 20:13 |
| LarstiQ | moin mwhudson | 20:22 |
| guilhembi | vila: hello! thanks for your explanation on issue 3232; I'm not getting a word of it, but I'm re-trying :-) | 20:29 |
| === spm_ is now known as spm | ||
| vila | guilhembi: rats, want some private chat for better explanations ? | 20:30 |
| guilhembi | vila: good idea | 20:30 |
| vila | here we go | 20:30 |
| Lo-lan-do | jelmer: If you have a couple of minutes, could you have a look at http://pastebin.com/f5245a8a8 ? | 20:36 |
| LarstiQ | jelmer: do you have any plans for fosdem btw? | 20:36 |
| Lo-lan-do | It's the log from the two "bzr update", two "bzr status" and one "bzr commit" | 20:37 |
| LarstiQ | jelmer: in case we might want to do something bzry, before I start volunteering for the Debian video team. | 20:37 |
| Lo-lan-do | The timing information depresses me :-( | 20:37 |
| jelmer | Lo-lan-do, whoa, that's really slow | 20:39 |
| jelmer | Lo-lan-do, you may want to use -Dtransport also | 20:39 |
| jelmer | (that will print the SVN remote operations) | 20:39 |
| jelmer | LarstiQ, not particularly yet - meeting up with Lo-lan-do and Jc2k | 20:39 |
| jelmer | LarstiQ, perhaps it's a good idea to have a meetup of all people interested in bzr | 20:40 |
| LarstiQ | jelmer: count me in | 20:40 |
| LarstiQ | jelmer: just a meetup, or maybe some sprinting as well? | 20:40 |
| jelmer | LarstiQ, some sprinting would be nice as well, but it depends a bit on whether we can find space, etc | 20:41 |
| Lo-lan-do | jelmer: Temporary output is at http://pastebin.com/f7dde941f | 20:41 |
| jelmer | Lo-lan-do, thanks | 20:42 |
| * Jc2k would be interested in FOSDEM/bzr action | 20:43 | |
| === beaumonta is now known as abeaumont | ||
| Jc2k | (alas my sprinting usefulness is limited to bzr-git and a few small plugins) | 20:44 |
| LarstiQ | jelmer: we can ask the organizers :) | 20:45 |
| LarstiQ | Jc2k: that's fine | 20:45 |
| * Jc2k crosses his fingers and chants at bzr-git | 20:57 | |
| Lo-lan-do | Jc2k: Would that be two-way? | 20:58 |
| Jc2k | Lo-lan-do: hmm? | 20:58 |
| Lo-lan-do | Sorry, I thought you were implying you were working on bzr-git, and I wondered whether it's two-way (or planned to be). | 20:59 |
| asabil | I think it would be very interesting to have a talk about the inner working of bzr during the FOSDEM | 20:59 |
| asabil | and maybe explain the design decision/difference between bzr and git | 21:00 |
| Lo-lan-do | asabil: As a user, I would love such a talk, yes. | 21:00 |
| asabil | :) | 21:01 |
| asabil | I think bzr weakest point is its marketing | 21:01 |
| Jc2k | Lo-lan-do: i am, but not on that bit. its planned to be, but its just git -> bzr atm | 21:01 |
| Jc2k | Lo-lan-do: (i'm writing a git server, so git users can clone and push to bazaar hosted repos) | 21:01 |
| james_w | asabil: I think we're too late for a talk, but we can certainly discuss it | 21:01 |
| beuno | jam, so, continuing our previous conversation, it should be easy-ish to cache the revnos in bzr itself, and invalidate (or update) the cache if the tip changes, right? | 21:02 |
| beuno | makes me wonder if I should spend my time doing that instead of all the madness I have planned for Loggerhead to tip-toe around the slowness to get revnos | 21:02 |
| lifeless | beuno: well my point is that its a bzrlib core issue | 21:03 |
| lifeless | beuno: effort put into fixing it should be put into the core :) | 21:03 |
| beuno | lifeless, right. I'm warming up to that idea. | 21:03 |
| beuno | it scares me ten times as much, because of all the touches, but I guess it's part of learning | 21:04 |
| lifeless | e.g. consider a plugin that maintains the cache per-branhc (like bzr-search does) | 21:04 |
| beuno | right, that sounds like a nice start | 21:04 |
| beuno | polish on top of the plugin until it's in a mergable state | 21:04 |
| beuno | I may just do that | 21:04 |
| beuno | I ahve to research a little to make sure it's the only thing I need to drop getting the full revision graph | 21:05 |
| beuno | s/ahve/have | 21:05 |
| jam | beuno: you'll need the merge depth | 21:05 |
| jam | I believe | 21:05 |
| beuno | right, to get the changed-files-per-mainline-commit | 21:06 |
| mrooney | Is this worth reporting / anyone know what's going on? http://paste.pocoo.org/show/99505/ | 21:06 |
| jam | I also don't know what info you would want to be able to display non-mainline revs in a fold | 21:06 |
| jam | jelmer: do you understand the SVN exception mrooney has? | 21:06 |
| beuno | jam, well, can I access the merge depth without getting the full revision graph? | 21:07 |
| jam | beuno: probably not, but you'll also probably want the mainline revision that merged that revision | 21:07 |
| jam | merge_sort gives things to you in a specific order that you can use | 21:07 |
| jam | so you probably need some way to preserve that ordering | 21:07 |
| jam | I don't know how loggerhead caches it now | 21:08 |
| Lo-lan-do | jelmer: Full log at http://pastebin.com/f39f8723e | 21:08 |
| asabil | james_w: I think it is still possible to get a Talk | 21:09 |
| beuno | jam, the only thing that LH caches right now, is what files changed in each mainline revision and it's children | 21:09 |
| asabil | you will probably just need to contact them | 21:09 |
| * mrooney waves at james_w | 21:09 | |
| james_w | hey mrooney | 21:09 |
| LarstiQ | jelmer, Jc2k, Lo-lan-do: devrooms at fosdem are taken, so no official sprinting room | 21:12 |
| beuno | lifeless, in part, what changed my mind about where to cache revnos, is understanding *today* that they where calculated every single time again | 21:12 |
| Jc2k | we should hang around the GNOME guys in Bazaar t-shirts... | 21:13 |
| jelmer | Lo-lan-do, thanks | 21:25 |
| jelmer | mrooney, don't think I've seen that one before | 21:25 |
| LarstiQ | Jc2k: hmm, mightn't that be offensive? | 21:25 |
| jelmer | mrooney, please file a bug | 21:25 |
| mrooney | jelmer: it seems to be the result of perhaps the output of a post-commit hook? | 21:25 |
| mrooney | will do! | 21:26 |
| jelmer | mrooney, please test with 0.4.16 / 0.4.17 as well | 21:26 |
| jelmer | mrooney, I'm not sure, I think that gives a different exception | 21:26 |
| Jc2k | LarstiQ: :] it wouldnt offend me, i cant speak for my Git using counterparts, though :] | 21:27 |
| jelmer | Jc2k, asabil: it would be nice to talk about roundtripping revisions | 21:27 |
| jelmer | at FOSDEM, I mean | 21:27 |
| Jc2k | jelmer: yes | 21:27 |
| mrooney | jelmer: is there a PPA for that by any chance? What is the easiest way to try those versions in Intrepid? | 21:27 |
| Jc2k | jelmer: oh, git head just got a new command we need to look at too - git note(s) | 21:27 |
| Jc2k | jelmer: for associating arbitary blobs with commits (but not in commits) | 21:28 |
| asabil | jelmer: sure | 21:29 |
| jelmer | mrooney, yeah, there is a PPA for the latest versions of bzr, I don't think it includes the latest bzr-svn at the moment though | 21:29 |
| jelmer | Jc2k, ah, that sounds interesting.. | 21:29 |
| Jc2k | jelmer: it fills me with fear :-\ | 21:30 |
| jelmer | Jc2k, uhm, fear? | 21:30 |
| Jc2k | jelmer: i dont think it would be the right place for us to stash mapping data, but it is another "thing" for us to worry about supporting | 21:33 |
| jelmer | Jc2k, it sounds like the perfect place to store mapping data.. | 21:34 |
| Jc2k | im wondering if it might be local only - not sure how it would work with push/pull | 21:34 |
| asabil | Jc2k: what about trying to get a slot in the GNOME devroom about bzr git-serve ? | 21:36 |
| asabil | I know it maybe a bit late to ask | 21:36 |
| asabil | but it would probably be possible to get a slot if you ask for it | 21:36 |
| Lo-lan-do | jelmer: It seems that the SVN revision 6019 corresponds to the first commit I did through bzr-svn on that tree. Dunno if that helps, but it looks conspicuously like bzr-svn does a get-dir for every subsequent revisions on the same branch. | 21:37 |
| Jc2k | jelmer: see bf4d57 | 21:37 |
| Jc2k | asabil: only if i can get a demo working in next few days | 21:38 |
| asabil | if you ask for a slot, you will get it working :p | 21:38 |
| mrooney | jelmer: ta-da! https://bugs.edge.launchpad.net/bzr/+bug/316891 | 21:45 |
| ubottu | Ubuntu bug 316891 in bzr "bzr-svn: SubversionException on certain statuses of post-commit hook" [Undecided,New] | 21:45 |
| mrooney | does it look okay? | 21:45 |
| === Mario__ is now known as pygi | ||
| vila | beuno: Listen more carefullt next time, I *told* you :-) | 21:52 |
| jelmer | mrooney, thx | 21:52 |
| beuno | vila, did you? I must have some level of ADD | 21:55 |
| LarstiQ | I know I do. | 21:56 |
| vila | I'm pretty sure it came on the table the time we walk together in loggerhead code, but some info needs more time than others to travel in brains :) | 21:56 |
| beuno | vila, right. Maybe it's one of those things I had to discover, no matter how much it was explained to me | 21:57 |
| vila | beuno: exactly, remember: learning is always painful or it's not learning :) | 21:58 |
| beuno | I try to forget that ;) | 21:59 |
| jam | beuno: when will you learn ... | 22:01 |
| * beuno hurts | 22:02 | |
| jam | :) | 22:03 |
| === rocky1 is now known as rocky | ||
| markh | jam: installer looks good :) | 23:12 |
| Jc2k | jelmer: i can push a git-mirror.gnome.org repo into bazaar and get it back out again intact (aside from something is stopping the refs from getting set correctly :\) | 23:56 |
| jelmer | Jc2k, nice! | 23:58 |
Generated by irclog2html.py 2.7 by Marius Gedminas - find it at mg.pov.lt!