| === Spaz is now known as Kittens | ||
| === kiko-afk is now known as kiko-zzz | ||
| igc | morning all | 00:33 |
|---|---|---|
| james_w | heh, oldest bzr bug: https://bugs.edge.launchpad.net/bzr/+bug/3708 | 02:06 |
| ubottu | Launchpad bug 3708 in bzr "progress indicators are often buggy" [Wishlist,Confirmed] | 02:06 |
| james_w | (open bzr bug) | 02:06 |
| lifeless | Peng_: are you around? | 03:05 |
| poolie | james_w, woo, i wouldn't say it's fixed now but it should be when the new system is used by all transports i | 03:16 |
| poolie | imo | 03:16 |
| lifeless | heh, compressbench was compressing 22K copies of the same text. Oooops. | 03:19 |
| mwhudson | bet that compressed fairly well | 03:27 |
| lifeless | mwhudson: knits got it down to 141MB | 03:34 |
| lifeless | mwhudson: which is an epic fail if you ask me | 03:34 |
| lifeless | mwhudson: gc got it to 500K | 03:34 |
| lifeless | I was wondering how it managed to work on my laptop when I only had 1.5GB free and the corpus is 3.4GB | 03:39 |
| alevine | Is there any way to exclude directories from a checkout? I am trying to import a svn repo into bzr which has a directory of huge binaries. | 03:39 |
| bob2 | 'slowly' | 03:39 |
| lifeless | bob2: btw I'm here | 03:40 |
| lifeless | alevine: not really; you could filter a fastexport stream to remove them, or something like that I guess; are you using bzr-svn? | 03:40 |
| alevine | lifeless, yeah I am. Tried a branch with --stacked but it said that was experimental and I couldnt branch after that | 03:42 |
| alevine | And when I try to download the whole repo the connection inevitably fails | 03:42 |
| lifeless | alevine: try branch -r 1 svn://foo bar; cd bar; bzr pull -r 2; bzr pull -r 3 etc | 03:48 |
| lifeless | (use bigger gaps if you like) | 03:48 |
| alevine | hehe, oy | 03:49 |
| alevine | suppose that will probably work | 03:49 |
| alevine | thanks | 03:49 |
| lifeless | hi arjenAU | 03:52 |
| arjenAU | lifeless: hey. in Tas @ LCA | 03:53 |
| `mousey | I've been reading the bzr documentation and noticed this "Bazaar has out of the box integration with Bugzilla, Trac and Launchpad's bug tracker." | 04:12 |
| `mousey | how can I integrate my bzr repo with my bugzilla system? | 04:13 |
| `mousey | ohhh i found it after some digging around on the offline hel | 04:23 |
| lifeless | arjenAU: me too | 04:47 |
| `mousey | does anyone know if it's possible to load up an external diff tool when diffing revisions in tortoisebzr? | 05:26 |
| lifeless | `mousey: I'm not sure sorry | 05:26 |
| lifeless | markh: ^ | 05:26 |
| arjenAU | lifeless: yea found out... duh | 05:30 |
| lifeless | arjenAU: :) | 05:36 |
| poolie | hi lifeless | 05:37 |
| poolie | so does that mean all the compressbench numbers are wrong? | 05:38 |
| lifeless | yes | 05:38 |
| lifeless | :( | 05:38 |
| lifeless | I have no sense of the vector yet | 05:38 |
| lifeless | clearing enough disk space to find out | 05:38 |
| alevine | lifeless, so once I get this huge svn repository downloaded, will I be able to quickly branch a subdirectory of this new bzr repo (assuming those huge binaries are not ancestors of anything I am branching) | 05:54 |
| lifeless | alevine: maybe; it depends on exactly how you are converting; you should read the bzr-svn docs some more I think. svn and bzr are verry differnet in what they consider a branch | 05:59 |
| alevine | lifeless, I guess what I'm asking is this: if I have a regular bzr repo that I branch that has folders a and b. a has txt files and b has 800MB files | 06:01 |
| alevine | if i then branch repo/a will that copy over all the 800MB files? | 06:01 |
| lifeless | alevine: the terms 'branch' and 'repo' are not interchangable; but you used them as such above. | 06:11 |
| lifeless | alevine: a branch is a branch, you can't 'branch' a subdir of a branch, unless that subdir is itself a seperate branch | 06:11 |
| alevine | lifeless, so you're saying that you can't make a subdirectory of a branch into a branch? | 06:18 |
| alevine | i think you inferred that but I dont want to assume | 06:26 |
| poolie | hi igc | 06:45 |
| poolie | jelmer: don't suppose you're around? | 06:49 |
| vila | hi all | 06:57 |
| vila | poolie: I rarely saw jelmer here so early :) | 06:57 |
| poolie | yeah, but you know students and sleep cycles | 07:00 |
| poolie | how are you, vila? | 07:00 |
| vila | hehe, students | 07:00 |
| vila | fine | 07:00 |
| igc | hi poolie | 07:03 |
| igc | hi vila | 07:03 |
| vila | Hey Ian | 07:06 |
| poolie | vila, igc, do you want to catch up before i go? (i'm leaving tomorrow morning) | 07:07 |
| igc | poolie: sure | 07:08 |
| * igc dinner | 08:54 | |
| vila | guilhembi: ping | 09:18 |
| guilhembi | vila: pong | 09:19 |
| Oli`` | I've got a local repo bound to a remote one so when I commit locally the changes are automatically pushed up. That's great and I'd like to keep that but I'd also like to trigger a remote update at the same time... Is that something I can do? | 09:32 |
| bob2 | branch, not repo? | 09:32 |
| Oli`` | sorry yes | 09:32 |
| Oli`` | so a cross between binding and the push-and-update pluging, I guess | 09:34 |
| speakman | hi folk, i've a question about merging; Lets say theres three people A, B and C which all have their own branch of the same project. What if A makes a change, which B merges directly from A and person C merges from both A and B (which both seems to have modified branches, not knowing it's the same commit). Now when person A finally merges some changes from person C, the bzr log of person A will look very ugly, something like circular merge commits. Ho | 09:40 |
| === kiko-zzz is now known as kiko | ||
| === bac` is now known as bac | ||
| === abentley1 is now known as abentley | ||
| === bac is now known as bac_snow_whee | ||
| === bac_snow_whee is now known as bac | ||
| speakman | I see alot of people joined lately. I'll paste my question again: | 12:27 |
| speakman | hi folk, i've a question about merging; Lets say theres three people A, B and C which all have their own branch of the same project. What if A makes a change, which B merges directly from A and person C merges from both A and B (which both seems to have modified branches, not knowing it's the same commit). Now when person A finally merges some changes from person C, the bzr log of person A will look very ugly, something like circular merge commits. Ho | 12:27 |
| markh | speakman: even though your message seems to have been truncated, you will probably need to come up with a test-case which demonstrates exactly how person a's log is ugly and explaining how you thing it should look instead. That doesn't sound trivial, so it might be better suited on the mailing list... | 12:29 |
| speakman | markh: Thanks for your comments. I think I'm too new to distributed versioning to really have an idea how it should look like. But in one of my current project, and web developing project, there will be like three or four parallell developers which I will randomly merge from to get their eventually changes. | 12:32 |
| james_w | speakman: it won't end up circular | 12:33 |
| speakman | And if I'm person A and person B just merged from me (and commited it to his branch) it will, when I merge from him next time, look like he had done some real changes. | 12:33 |
| markh | speakman: is this a real problem you are seeing, or a theoretical problem you are concerned you might see? | 12:33 |
| james_w | speakman: yes, there will be an extra revision which is B's merge from you | 12:34 |
| speakman | markh: we havn't started really yet, but I did some test with three different branches on my local machine and it ended up like this. | 12:34 |
| speakman | Actually; we're trying to find a suitable workflow for improving the phpBB3 code base for our own purpose (we're running a public forum which will customize the forum code to our needs) | 12:35 |
| speakman | If anyone have a better idea how to manage the development, I'm really listening :) | 12:35 |
| markh | speakman: as james_w says, the log will show the merge - is that your concern? | 12:37 |
| speakman | (i'm also thinking of another option where there will be a PQM which handles merge of patches/bundles through a mailinglist/mail account. But I've never setup an PQM and I'm not 100% sure of how it's working) | 12:37 |
| markh | if not, you will need to be more specific... | 12:38 |
| speakman | markh: person A's log will show persons B's merge of person A, and the log from merge from person C will show his merge from both person A and person B. Alot of spam in the log, but no code change. | 12:38 |
| speakman | I'll make a test right away, please hold on. | 12:38 |
| markh | speakman: alternatively, do a log of bzr.dev or something similar, and identify the revisions you think are noise? | 12:40 |
| speakman | This is how it could look: http://pastebin.com/f27a1b1d | 12:43 |
| james_w | speakman: if you don't like that then alias "merge" to "merge --pull" | 12:44 |
| markh | speakman: IOW, oerson B should have done a simple 'pull' instead of a merge as his branch doesn't seem to have diverged. james_w: is that correct? | 12:46 |
| markh | but if person b's branch had diverged, he would have checkins which would have been merged and would be shown. | 12:47 |
| markh | (IOW, only merge when you have actual changes to merge) | 12:48 |
| * markh thinks... :) | 12:48 | |
| james_w | or investigate rebase, but it's not really recommended | 12:48 |
| speakman | oh, never though of "pull". What's the difference with "bzr pull" and "bzr merge --pull" ? | 12:48 |
| james_w | merge --pull will do a merge if needed | 12:49 |
| james_w | pull will tell you a merge is needed | 12:49 |
| james_w | if the branches have diverged then a merge is required | 12:49 |
| james_w | the only way to avoid the extra revisions is to re-write history | 12:49 |
| speakman | oh, so the default action should actually be "bzr pull" for everyone? | 12:50 |
| speakman | and use only "bzr merge" when really needed? | 12:50 |
| james_w | depends how you look at it | 12:50 |
| speakman | (this should *really* be included in the docs!) | 12:50 |
| markh | speakman: yeah, and yeah, it should! | 12:50 |
| james_w | if you always use "bzr merge" then your mainline records what happened to your branch | 12:50 |
| james_w | if you ever use pull then it synchronises your branch to the other, so the mainline shows what happened to their branch | 12:51 |
| speakman | I think the Docs are really good in general, but it lacks real world issues. Something like a web developing project example. | 12:51 |
| james_w | either one of those could be desirable | 12:51 |
| james_w | speakman: if you point to where you would have expected to find this in the docs we can fix it | 12:51 |
| Peng_ | lifeless: pong :P | 12:51 |
| markh | bzr suffers from an "embarrassment of riches" in some respects - too many possible workflows... | 12:52 |
| speakman | james_w: I guess somewhere close to the "Workflows"-section imo | 12:52 |
| speakman | I think the Workflows-section is really good, but the "Real world examples" sounds like a section on its own | 12:53 |
| markh | it could be said there are lots of scenarios, but not much in the way of real world guidance... | 12:53 |
| speakman | I think web developing (in php) is pretty commong | 12:53 |
| speakman | -g | 12:53 |
| markh | I think what I do is pretty common too ;) | 12:53 |
| markh | (which isn't that ;) | 12:54 |
| speakman | And the mess PHP programming can result in, it's a pretty hard case too ;) | 12:54 |
| james_w | http://doc.bazaar-vcs.org/bzr.dev/en/user-guide/#team-collaboration-distributed-style | 12:54 |
| james_w | http://doc.bazaar-vcs.org/bzr.dev/en/user-guide/#pseudo-merging | 12:54 |
| speakman | markh: I don't like PHP very much myself, but I really think it's one of the most wide spread languages and even used | 12:54 |
| james_w | so the doc explains the recommended workflow | 12:55 |
| james_w | which you didn't want | 12:55 |
| james_w | it could perhaps do with more on the difference between merge and pull | 12:55 |
| markh | james_w: well, I'm not sure I agree with that :) In fact, I've heard jam argue that in many cases, asking every core developer to use a *checkout* of the trunk is best practice - particularly to avoid the whole "overwriting of history" thing which push can do and the details of which currently escape me... | 12:56 |
| james_w | yeah, and that's in the doc | 12:57 |
| james_w | if you have a trunk | 12:57 |
| * speakman 's reading the docs... | 12:58 | |
| markh | the broader point is that for someone completely new, the "best practice" isn't always clear - especially when coming from a VCS which only has *one* workflow :) | 12:58 |
| james_w | true | 12:58 |
| speakman | markh +1 | 12:59 |
| james_w | but you appear to have decided that you wanted the no-mainline approach | 12:59 |
| speakman | Anyone knows how "git" handles this? | 12:59 |
| james_w | you just wanted the less preferred "pull" workflow to go with that | 13:00 |
| james_w | which isn't documented, to reduce the number of documented workflows | 13:00 |
| speakman | I could go with a mainline, but then more people than me must be able to merge things into it. | 13:00 |
| james_w | it does "merge --pull" by default | 13:00 |
| speakman | The main problem is more that I need to introduce an easy way to real bzr newbies (and not very skilled users at all) to make use of bzr through the PHP development. | 13:02 |
| speakman | The actual problem is the PHP language which seems too easy to start with, and therefor will never filter some sort of people out ;) | 13:02 |
| markh | speakman: so *my* preferred approach is to have a nominated "trunk" which people do *checkouts* from into a local dir. They then *branch* this local dir into another dir for performing changes, and make checkins to the second dir. When ready, they merge the second dir back into the first. This merge will leave an uncommitted merge into the initial checkout. They then test the merged changes, and perform a "checkin" into this checkout of | 13:03 |
| speakman | (this would probably never be a big issue if it was skilled C programmers) | 13:03 |
| speakman | markh: your message got truncated after "into this checkout of..." | 13:04 |
| markh | speakman: i doubt it has much to do with the language :) If the developers may struggle with the dvcs concepts, you may be best "emulating" SVN with pure checkouts everywhere... | 13:04 |
| markh | ... They then test the merged changes, and perform a "checkin" into this checkout of the trunk - the checkin then actually changes the remote trunk. | 13:05 |
| speakman | markh: They've no clue what's SVN... | 13:05 |
| markh | speakman: conceptually, a single "checkout" they use and perform a simple "checkin" to with a single set of changes might be easier to convey... | 13:06 |
| speakman | But your example above seems like a way that could work... | 13:06 |
| markh | which would change my example to avoiding the use of the second dir completely... | 13:06 |
| speakman | How about setting up an PQM and make them "bzr send" their changes? | 13:06 |
| markh | ie, just do a checkout, make changes, test, checkin. | 13:06 |
| markh | speakman: that's more than I know about, but probalby something you might consider further down the track... | 13:07 |
| speakman | markh: that seems like the easiest way, but then I could go with SVN as well right? :) | 13:07 |
| markh | speakman: well, with svn you would be *limited* to that approach | 13:08 |
| speakman | With SVN I could setup an SVN server which they could commit their changes to, which even handles authentication and ACL. A thing i really miss with bzr serve. | 13:08 |
| markh | but the more advanced developers could still use branches and merging if you use bzr | 13:08 |
| markvandenborre1 | hi! we're deciding on a vcs to use here | 13:08 |
| speakman | markvandenborre1: go with bzr :) | 13:09 |
| markvandenborre1 | and my colleague is wondering if there is some kind of visual studio 2k8 integration | 13:09 |
| markh | markvandenborre1: not a functioning one I am aware of :) However, there is a good "tortoise" for general integration with explorer, "file open" dialogs, etc... | 13:10 |
| speakman | markh: point taken, next thing is to setup permissions for some users to commit checkouts to the mainline. That wouldn't be a problem if the mainline pulled them itself :) | 13:10 |
| markvandenborre1 | I can only find a reference to a google summer of code project from 2007 | 13:10 |
| markvandenborre1 | but no code at first sight | 13:10 |
| markvandenborre1 | speakman: I'd love to, but I need cold hard technical arguments | 13:10 |
| markvandenborre1 | over svn | 13:10 |
| markh | speakman: if the trunk is behind sftp for example, then it manages write access IIUC. I've no clue about auth and the smart-server though... | 13:11 |
| markvandenborre1 | markh: you mean tortoisebzr? | 13:11 |
| markh | markvandenborre1: look at the tortoisebzr project on launchpad - the code is very current and very active - by me :) | 13:11 |
| markh | yes | 13:11 |
| markvandenborre1 | ah, I see | 13:12 |
| markvandenborre1 | nice | 13:12 |
| speakman | markvandenborre1: IIUC? | 13:12 |
| speakman | sry, markh | 13:12 |
| markh | "if i understand correctly" | 13:12 |
| markh | markvandenborre1: the 1.11rc1 binaries are stable and include tortoise... | 13:16 |
| markh | (the 1.10 binaries have a somewhat broken tortoise :( ) | 13:16 |
| speakman | markh: leaving ftps access to each committer will make the whole repository very vulnerable. If bzr serve could make use of authentication what would work as a command filter making sure people can only do commits and nothing else. | 13:21 |
| markh | speakman: I'm afraid I'm not familiar with the various server options or their auth at all... | 13:22 |
| speakman | There is another option; using bzr as a CGI/WSGI interface. Then use Apache's own digest for authentication. | 13:22 |
| speakman | http://doc.bazaar-vcs.org/bzr.dev/en/user-guide/#id80 | 13:23 |
| speakman | sorry: http://doc.bazaar-vcs.org/bzr.dev/en/user-guide/#serving-bazaar-with-fastcgi | 13:23 |
| markh | to clarify, I've no actual *interest* or desire for knowledge in that either ;) | 13:24 |
| speakman | (here at my company we use smart serve with inetd and it works really good, but then it's a local protected network) | 13:24 |
| markh | yeah, I've too much experience in integrating NTLM authentication with various servers to find it remotely interesting... :) | 13:25 |
| markh | I'd rather keep auth as officially "somebody else's problem" | 13:26 |
| speakman | NTLM? | 13:27 |
| markh | windows auth | 13:28 |
| speakman | Windows? (kidding... :) ) | 13:28 |
| markh | :) | 13:29 |
| speakman | I still think there should be a real world use case based on web developing in the docs. | 13:29 |
| markvandenborre1 | +1 | 13:30 |
| markvandenborre1 | but then again, I'm too lazy to write that out myself | 13:30 |
| markvandenborre1 | (doing other work to help free software, though, like helping to organise FOSDEM) | 13:31 |
| markvandenborre1 | markh: thx for the helpful hint on tortoisebzr | 13:31 |
| speakman | After this web project has start working in a great maner, I might write one. But until then I really need a working solution to start with :) | 13:32 |
| === kiko is now known as kiko-phone | ||
| markh | speakman: there are lots of working options - the most appropriate depends on lots of things though | 13:36 |
| markh | popd | 13:36 |
| markh | oops :) | 13:36 |
| vadi2 | bzr break-lock isn't working for me for some reason: http://paste.pocoo.org/show/100522/ | 13:37 |
| vadi2 | I tried it several times, but it doesn't want to break | 13:38 |
| markh | vadi2: there is no evidence there of you having run 'bzr break-lock lp-46717904:///~vadi-mapper-dev/vadi-mapper/main/.bzr/branch/lock ' | 13:38 |
| vadi2 | It still says just error, unsupported | 13:39 |
| vadi2 | http://paste.pocoo.org/show/100523/ | 13:40 |
| markh | sorry, no idea :( | 13:42 |
| Peng_ | "bzr break-lock lp:vadi-mapper | 13:44 |
| Peng_ | Augh, I keep copying newlines. | 13:44 |
| Peng_ | vadi2: "bzr break-lock lp:vadi-mapper"? | 13:44 |
| Peng_ | The error message giving the wrong URL is either a known bug or was fixed a month or two ago. | 13:45 |
| vadi2 | ey that worked, thanks! | 13:45 |
| === bac is now known as bac_afk | ||
| === bac_afk is now known as bac | ||
| === aumontabe is now known as abeaumont | ||
| Le-Chuck_ITA | Hi there. I made the mistake to bzr add a big directory of never changing binaries, and now I have a huge .bzr. How can I "unversion" the directory and drop it from the .bzr repository forever? | 15:18 |
| === fawek_ is now known as fawek | ||
| james_w | Le-Chuck_ITA: was this in the last revision, or has it been going on for a while? | 15:26 |
| Le-Chuck_ITA | it has been going on for a while | 15:29 |
| Le-Chuck_ITA | james_w: googling around it seems that the easiest solution is to re-init the repository! | 15:29 |
| james_w | there's not a good answer for that yet | 15:30 |
| james_w | you could re-write the repository to remove that data, but the code hasn't been written yet as far as I know | 15:30 |
| Le-Chuck_ITA | james_w: thanks at least now I know this... will be more careful next time. | 15:31 |
| awilkins | You could rebase your repo | 15:33 |
| awilkins | branch it at -r <disaster -1> | 15:33 |
| Le-Chuck_ITA | awilkins: that won't make the .bzr smaller | 15:34 |
| awilkins | Hmmph, I'm not thinking this through | 15:34 |
| Le-Chuck_ITA | and I like to pass the .bzr along by email :) | 15:34 |
| awilkins | Once you've eliminated the revision with teh binaries you can branch it off to a separate repo and send that instead. | 15:35 |
| awilkins | But I'm now not sure rebase will do that :-( | 15:35 |
| Le-Chuck_ITA | thanks I may try later but the history until now was "monotonic" in the sense that we didn't erase anything yet :) Thus if I throw it away I am just fine | 15:36 |
| awilkins | That's certainly the easiest route :-) | 15:37 |
| vila | jam: ping | 15:37 |
| === asac_ is now known as asac | ||
| jonnydee | can anyone tell me when I should merge and when I should pull changes? | 15:56 |
| jonnydee | in my case I have a development branch and branched from it a testing branch. now when the development branch evolved should I merge or pull the changes into the testing branch? | 15:57 |
| jonnydee | as far as I understand it a pull does pulls in the changes from the development branch which results in two equal branches (assumed the testing branch has not evolved separately) | 15:59 |
| jonnydee | while a merge will reflect the merge in the testing branch's history | 16:00 |
| jam | vila: pong | 16:00 |
| jonnydee | so I get two different branches because the testing branch shows in its history a merge. | 16:01 |
| jonnydee | am I correct? | 16:01 |
| === kiko-phone is now known as kiko-fud | ||
| ollie | hey guys i need a little help getting my head around setting up a bzr repo | 16:21 |
| ollie | i have created /home/bazaar/repository/web/project/example.com/ | 16:21 |
| ollie | then bzr init in example.com | 16:21 |
| ollie | i then do a checkout from a ssh user e.g. /home/developer1/dev/example.com | 16:22 |
| ollie | I have apache setup so that i can view the dev version for my developers e.g. dev1.example.com | 16:22 |
| ollie | which has a document root at /home/developer1/dev/example.com | 16:23 |
| ollie | but I want to have branches in my repo e.g. /home/bazaar/repository/web/project/example.com/developer1/ /home/bazaar/repository/web/project/example.com/developer2 | 16:23 |
| ollie | which i am not sure how to do | 16:23 |
| ollie | or in fact how i would manage the branch changes and merge them back into the trunk | 16:24 |
| ollie | the idea is that every developer has their own space on the server to develop and then i can push from the trunk to a live server when i am happy with the changes | 16:24 |
| ollie | so really just after some advise or pointers. Odly, there seems to be very little that a google returns on this | 16:25 |
| visik7 | what's the problem with trac on bzr ? | 16:28 |
| ollie | see http://bazaar-vcs.org/TracBzr | 16:29 |
| visik7 | someone told me that DVCS aren't very manageable with trac | 16:29 |
| visik7 | 'couse it's slow | 16:29 |
| ollie | https://launchpad.net/trac-bzr | 16:29 |
| davidstrauss | How do you start the QBzr bundled with the Mac OS X .dmg? | 16:37 |
| visik7 | bzr qbzr | 16:38 |
| jonnydee | regarding my case I just explained, please let me just know what you would do...? | 16:44 |
| visik7 | trac or launchpad ? | 16:47 |
| visik7 | I can't decide | 16:47 |
| === BjornT_ is now known as BjornT | ||
| shankhs | hi | 17:23 |
| shankhs | I installed bzr but bzr is not working behind proxy with authentication. | 17:25 |
| shankhs | what to do? | 17:26 |
| === abadger19991 is now known as abadger1999 | ||
| garyvdm | shankhs: What os are you using? | 17:52 |
| garyvdm | I know you can set the $http_proxy environment var on linux | 17:52 |
| garyvdm | Not sure if it works on windows though. | 17:53 |
| garyvdm | export http_proxy=http://username:password@host:port/ | 17:54 |
| ericvw | I am getting GPG verify error when using the PPA repository. Has anyone else been getting this error? | 18:12 |
| james_w | ericvw: it's signed now | 18:14 |
| james_w | you could add the key to avoid MITM attacks | 18:15 |
| ericvw | james_w: how can I do that? | 18:16 |
| james_w | apt-key | 18:16 |
| james_w | you can get the key from keyserver.ubuntu.com | 18:17 |
| james_w | id is 8C6C1EFD | 18:17 |
| james_w | you can then check the fingerprint at https://edge.launchpad.net/~bzr/+archive/ppa | 18:18 |
| james_w | if you are using the "bzr" ppa that is | 18:18 |
| ericvw | james_w: Sorry I am a bit new to using apt-key and adding sources to apt-get, so how do I use apt-key with keyserver.ubuntu.com? | 18:19 |
| james_w | dunno :-) | 18:19 |
| ericvw | interesting. I'll search around a bit. Thanks! | 18:19 |
| ollie | I am having a few problems with bzr ignore. The directory I am trying to ignore is not versioned and has been added using bzr ignore config/*. shows in .bzrignore but when i do a bzr st the folder comes up as unknown and the files in config/* are not shown when i do a bzr ignored. This leads me to believe that it has not worked properly. My terminal output can been seen here http://pastebin.com/m7deae95e. Any ideas? | 18:20 |
| james_w | ericvw: http://keyserver.ubuntu.com:11371/pks/lookup?op=get&search=0xD702BF6B8C6C1EFD is where the key is | 18:22 |
| garyvdm | ollie: bzr ingore config | 18:22 |
| garyvdm | *ignore | 18:23 |
| ollie | Warning: the following files are version controlled and match your ignore pattern: | 18:23 |
| ollie | concrete/config | 18:23 |
| james_w | wget -O - "http://keyserver.ubuntu.com:11371/pks/lookup?op=get&search=0xD702BF6B8C6C1EFD" | egrep -v "^<" | sudo apt-key add - | 18:23 |
| james_w | ericvw: ^ | 18:23 |
| ericvw | I got it | 18:24 |
| ericvw | james_w: thanks | 18:24 |
| james_w | no problem | 18:24 |
| garyvdm | ollie: bzr ignore ./config | 18:24 |
| ollie | garyvdm: is it possible to remove a rule? | 18:26 |
| ollie | i edit it using vi but it just seems to come back | 18:26 |
| garyvdm | Ollie: I normaly just edit .bzrignore by hand | 18:26 |
| ollie | yeah thats what i am doing weird | 18:26 |
| garyvdm | ollie: Not sure why | 18:27 |
| ollie | bzr ignore ./config/* that should just ignore the directory config in the root dir right? | 18:27 |
| Peng_ | Your shell should expand that to all of the files in config. | 18:28 |
| ollie | yeah it does so ./config/site.php then ./config/site_theme_paths.php (great) then config (doh). If i manually remove the last one config it gets written back in | 18:29 |
| ollie | it seems to be trapped in a loop | 18:30 |
| ollie | :( | 18:31 |
| ollie | cracked it :) | 18:34 |
| ollie | still don't see why bzr ignore ./config/site.php doesn't work | 18:34 |
| ollie | but hey | 18:34 |
| ollie | garyvdm: thanks for the help :) | 18:36 |
| garyvdm | ollie: Pleasure | 18:37 |
| sevenseeker | I am having trouble serving up my branch with the dedicated 'bzr serve' server | 19:15 |
| sevenseeker | client says 'foo' not a branch | 19:15 |
| sevenseeker | rather bzr://foo/root | 19:16 |
| sevenseeker | bzr info on server branch says it is the 'branch root: .' | 19:16 |
| sevenseeker | I am following the instructions at http://doc.bazaar-vcs.org/bzr.dev/en/user-guide/index.html#running-a-smart-server | 19:17 |
| === beaumonta is now known as abeaumont | ||
| === spm_ is now known as spm | ||
| davidstrauss | sevenseeker: bzr:// requires a domain name or IP address | 19:46 |
| sevenseeker | I have an entry in my /etc/hosts file, plus I tried using IP... same results | 19:48 |
| LarstiQ | sevenseeker: what command do you run on the server, from which directory? And what exact command do you run on the client? | 19:50 |
| sevenseeker | ok, I had a relative path for the --directory directive, that was the problem. I read about that but remembered incorrectly that it applied to only the bzr+ssh option | 19:52 |
| igc | morning | 20:11 |
| beuno | igc, hi! | 20:12 |
| beuno | just FYI, your plugin for caching revnos has made me extremly happy | 20:12 |
| beuno | haven't started testing it, but I will tomorrow | 20:12 |
| igc | thanks beuno. I thought you'd like it | 20:19 |
| igc | would it help under loggerhead? | 20:20 |
| igc | or in combination? | 20:20 |
| beuno | igc, it would ROCK in loggerhead | 20:21 |
| beuno | if we had that, and I understood how to access merge points partially, we may be able to solve a lot of the performance issues | 20:21 |
| beuno | as well as change the underlying madness I've been wanting to re-write | 20:22 |
| igc | beuno: so I think our goal should be to make the two plugins complementary | 20:22 |
| beuno | it was on my ToDO list to write exactly what you did, so I'm very happy that just popped out | 20:22 |
| igc | I don't think we want to cache twice | 20:22 |
| igc | in two separate places | 20:23 |
| beuno | igc, absolutely | 20:23 |
| gsuveg | bzr push:parent works only with developer version? | 20:24 |
| igc | beuno: I'm also planning to extend it to store depth information and to keep the data in top sorted order, allowing me to make log go faster | 20:24 |
| beuno | igc, this doesn't, OTOH, make the initial hit cheaper | 20:24 |
| beuno | ie, I'll have to generate the full revision graph at least once | 20:25 |
| igc | beuno: right, but you only get that once after the tip moves | 20:25 |
| igc | s/top/topo/ | 20:25 |
| beuno | igc, how about caching the merge-points between them as well? | 20:25 |
| james_w | gsuveg: you need a fairly recent version | 20:25 |
| james_w | 1.10 perhaps | 20:25 |
| * james_w waves to igc and beuno | 20:26 | |
| gsuveg | Bazaar (bzr) 1.11 | 20:26 |
| igc | hi james_w | 20:26 |
| * beuno waves back to james_w | 20:26 | |
| gsuveg | ive this and dont wokrs :) | 20:26 |
| igc | beuno: one step at a time :-) | 20:26 |
| beuno | :) | 20:26 |
| beuno | igc, if the tip changes, the cache gets invalidated? | 20:27 |
| igc | beuno: I thought it was a good effort for a day's work | 20:27 |
| igc | beuno: currently | 20:27 |
| beuno | igc, it would of taken me over a week, so it's an amazing effort for a day IMHO ;) | 20:27 |
| beuno | anyway, I'll start diving into it tomorrow, and will try to actually contribute patches and other useful things | 20:28 |
| igc | beuno: if there are no merge revisions in the new revisions, I'd like to append to the cache rather than wipe it but that's not done yet | 20:28 |
| beuno | ah! that sounds interesting | 20:29 |
| beuno | igc, I wonder if I combined the partial revno access jam worked on, with this plugin, I can make an even bigger cut in performance | 20:30 |
| igc | beuno: I'd expect so | 20:30 |
| jam | igc: as long as the mainline doesn't change, you can always append to the cache | 20:30 |
| jam | so even if you merge, etc | 20:31 |
| jam | so if old_tip is in branch.revision_history() then you can append new values | 20:31 |
| jam | that said, only the lazy_revno branch is able to compute just some of the numbers | 20:31 |
| jam | so you wouldn't save any time with bzr.dev | 20:31 |
| igc | the trouble is that with really large branches like emacs and OOo, no amount of "make the algorithm faster" competes with "just cache the end result" | 20:31 |
| jam | igc: sure, there are just various ways to reduce the amount needed to cache, etc. | 20:32 |
| beuno | jam, by "some of the numbers", do you mean "only mainline revnos"? | 20:32 |
| jam | beuno: if you don't change the mainline revisions, dotted revnos never change | 20:33 |
| jam | so if you append new mainline revisions | 20:33 |
| jam | the existing dotted revnos won't change | 20:33 |
| jam | only if you 'push' a new mainline would things change | 20:33 |
| vila | igc: at one point though, you'll hit the "loading cache result" is longer than "calculating only some revnos" | 20:33 |
| jam | right, vila. that was the goal to get to | 20:33 |
| jam | but really hard to achieve from my experience | 20:33 |
| * beuno is very happy that the revno performance topic is back on the table | 20:34 | |
| igc | jam, vila: right. | 20:34 |
| jam | I *am* curious what effect my lazy_revno branch would have on your timing numbers | 20:34 |
| igc | for emacs, revno-cache comes in at 5M or so | 20:34 |
| jam | since I think for emacs it would actually do pretty darn good | 20:34 |
| igc | load time in 1.1 secs on my laptop | 20:35 |
| jam | as they don't (yet) have complex merging ancestry | 20:35 |
| jam | IIRC | 20:35 |
| igc | right: 100K revs, 93K on mainline | 20:35 |
| igc | so some merges but nothing like mysql say | 20:36 |
| vila | igc: hehe | 20:36 |
| mwhudson | igc: how are you persisting the cache | 20:36 |
| mwhudson | ? | 20:36 |
| igc | mwhudson: simply as revno\trev-id\n, one per line | 20:37 |
| mwhudson | ah ok | 20:37 |
| igc | it's readable :-) | 20:37 |
| jam | igc: You could easily use a btree to do so | 20:38 |
| jam | btw | 20:38 |
| beuno | how bad would it be to create files with the revid as their name, and the revno as their content? | 20:38 |
| jam | and then you could look up a single value without having to read the whole thing | 20:38 |
| jam | I think you still need the merge depth | 20:38 |
| vila | igc: should be easy to index.. (jam was faster :P) | 20:38 |
| beuno | ah, btree's accomplish that | 20:39 |
| vila | beuno: you want to create 100k files ? | 20:39 |
| mwhudson | i guess for large caches (ab)using sqlite might be faster | 20:39 |
| mwhudson | or yes, a btree | 20:39 |
| gsuveg | bye | 20:39 |
| beuno | vila, well, I want to access a revid without going through a big list. 100k files is a side-product. But I get it, it's not good :) | 20:39 |
| igc | jam: yes, I still want and need to cache the merge depth too. | 20:41 |
| jam | igc: https://code.edge.launchpad.net/~jameinel/bzr/lazy_revno | 20:42 |
| jam | If you want to play around with what I worked on | 20:42 |
| jam | You may want to wait for the next mirror, since I merged bzr.dev and resolved the conflicts | 20:42 |
| jam | or get it from http://bzr.arbash-meinel.com/branches/bzr/1.6-dev/lazy_revno | 20:43 |
| igc | thanks | 20:44 |
| jam | I think it currently has some bugs wrt numbering of ghost revisions | 20:45 |
| jam | Partly because internally we are a bit inconsistent about how we handle them and NULL_REVISION | 20:46 |
| === mDuff is now known as nDuff | ||
| nDuff | BNF-Austin, howdy. | 20:49 |
| BNF-Austin | hello, that you Duffy | 20:50 |
| davidstrauss | BNF-Austin: Greetings from near Mopac & US-183 | 20:50 |
| nDuff | all, BNF-Austin is Basim Faris, one of the partners behind NossaTV (an early adopter of Bazaar, several years ago) | 20:50 |
| nDuff | davidstrauss, heh -- I'm over by Braker and 183. | 20:51 |
| BNF-Austin | i'm off 620, close to Lakeway. Working from home. | 20:51 |
| * nDuff is only working with NossaTV on an occasional and informal basis these days, and thus in the process of introducing BNF-Austin &c. to community support resources. | 20:53 | |
| BNF-Austin | Thanks for all the work that you has gone into. bzr. It has been great to use over the years. Duff suggested that I join, so that I can bug you guys, when i make beginner mistakes as I try to manage remote bzr instances... thanks ahead of time, I will do my best to avoid wasting your time. | 20:57 |
| jam | igc: so in my quick (and limited) testing, doing: | 20:57 |
| jam | 'ian.clatworthy@canonical.com-20090120040338-yxg0r2ab45lqtks9' | 20:57 |
| jam | is virtually instantaneous (.407s versus .377s baseline overhead) | 20:57 |
| jam | but 'v.ladeuil+lp@free.fr-20081205140447-vk9s1veaqyy3ch9t' is 1.7s versus 0.377s overheda | 20:58 |
| jam | then again, get_revision_id_to_revno_map is 2.87s | 20:58 |
| jam | igc: I would also imagine that you could insert your existing revno-cache into the LazyRevnoMapper code, to seed it with interesting points along the way | 21:02 |
| igc | jam: do you know what overhead calculating the merge depth (vs not) has? | 21:07 |
| igc | for something like log -rX.Y.Z, we generate the revno map as one step and then topo sort again later to get the merge depth | 21:08 |
| igc | I'm wondering if saving the merge depth in the first step would slow that step down or not | 21:08 |
| igc | I could then change log to ask the branch for the merge depth | 21:09 |
| igc | or perhaps branch.get_topo_sort() | 21:09 |
| igc | if it's already been done, we wouldn't need to do it again | 21:09 |
| igc | revnocache may as well save the revno,revid,depth in topo sorted order if it knows it | 21:10 |
| igc | and monkeypatch branch.get_top_sort() if we add that | 21:11 |
| igc | jam:^ | 21:11 |
| igc | beuno:^ | 21:11 |
| igc | s/get_top_sort/get_topo_sort/ | 21:12 |
| beuno | igc, I think that if it saved the depth, then the partial access issue would be solved | 21:12 |
| beuno | igc, I do have a question about the revnocache plugin: does it work both ways? revid -> revno and revno -> revid? | 21:13 |
| beuno | ie, does it work for bzr log -rX? | 21:13 |
| beuno | s/work/come into play | 21:13 |
| beuno | or just for converting revids intro revnos? | 21:13 |
| igc | beuno: it monkeypatches branch.get_revision_id_to_revno_map | 21:15 |
| beuno | I'm testing it a bit, but I don't seem to see a difference in doing bzr log -rX with or without the plugin | 21:16 |
| igc | right. try log -rx.y.z | 21:16 |
| igc | then try it again | 21:16 |
| beuno | aha! | 21:17 |
| beuno | it makes a big difference with dotted revnos | 21:17 |
| igc | or better still status -rx.y.z (as log in the mainline has speed issues well beyond just finding the revid to log) | 21:17 |
| beuno | so mainline revnos are cheap-ish? | 21:18 |
| igc | yes, they are now and have been in bzr.dev for some time | 21:18 |
| beuno | awesome, it cuts time in more than half | 21:18 |
| beuno | igc, but I don't see a difference when running: bzr log -rX -v --long | 21:20 |
| beuno | that shows dotted revnos, shouldn't it improve significantly as well? | 21:21 |
| mwhudson | does it only cache one way? | 21:25 |
| igc | beuno: see my email reply to Alex sent minutes ago | 21:31 |
| igc | mwhudson: branch.get_revision_id_to_revno_map() goes one way, but it's used by the code that maps the other as well | 21:32 |
| igc | the API return the full map, not just one value | 21:32 |
| beuno | igc, I can't find it. Is it a reply to the plugin announcement? | 21:33 |
| igc | yep. | 21:34 |
| beuno | igc, did it go to the list? | 21:34 |
| igc | beuno: sorry. it has now | 21:36 |
| beuno | igc, that's great, thanks | 21:40 |
| beuno | igc, I intend to use get_revision_id_to_revno_map in loggerheadlib, so this is still fantastic news for me :) | 21:41 |
| jam | igc: For calculating merge depth, we already do it to compute the dotted revno | 21:42 |
| jam | I would guess we could compute it without it, but for now we have it "free" | 21:43 |
| igc | jam: cool. thanks | 21:44 |
| jam | igc: the original goal of the lazy_revno branch was to replace the object returned by get_revision_id_to_revno_map | 21:45 |
| jam | just fyi | 21:45 |
| pickscrape | Is it possible to write a custom HPSS "procedure" in a plugin, and call it from a plugin at the client end? | 21:54 |
| jbalint | hi | 22:02 |
| jbalint | if i have a contents conflict, does this mean bzr thinks this is a binary file? | 22:02 |
| igc | jam: poolie is travelling today and I don't know if lifeless is here or not? | 22:03 |
| igc | jam: did you want a call? | 22:03 |
| jam | sure, you want me to start it? | 22:04 |
| igc | sure | 22:04 |
| supergonzo | Hi. I'm looking for some advice :-) I have managed to get colleagues to use bzr at work. But we are all using different editors and I would like to make sure tabs are replaced with 4 spaces when they commit. Any hint on how to do that (if it is feasible) ? | 22:08 |
| LarstiQ | jbalint: if it doesn't say Text conflict? Yeah, I think so. | 22:14 |
| jbalint | LarstiQ: is there any way to find out why it thinks so? i've checked this file,e there is no zero bytes of anything above 7f and teh extesion is .xml | 22:15 |
| LarstiQ | jbalint: iirc there is a heuristic that checks the first 1024 bytes for some binary related characters, \0 but maybe more | 22:17 |
| nDuff | supergonzo, there's a plugin called "bzr-whitespace" you might look at. It's more for warning or preventing checkins when whitespace is broken than silently fixing it, though. | 22:18 |
| jbalint | LarstiQ: right, but i'm guessing thats not the reason | 22:18 |
| nDuff | supergonzo, ...err, looks like it's been renamed to bzr-text-checker. | 22:18 |
| LarstiQ | jbalint: though it shouldn't trigger that, BOM perhaps? | 22:18 |
| glatzor | hello james_w, how can I call bzr bd inside of a python script? | 22:19 |
| jbalint | LarstiQ: i dont see it http://rafb.net/p/Lxtgiy61.html | 22:19 |
| supergonzo | thx nDuff. But plugins need to be installed in either everyone's ~/.bazaar directory, right? | 22:19 |
| glatzor | jaavaaguru, should I call the binary? | 22:20 |
| nDuff | supergonzo, generally, yes. If you use a PQM, you can have it run that check before accepting a merge request. | 22:20 |
| supergonzo | I'm the company's PQM :-) I'll have a look at that plugin or come up with a similar one. I should take a look at setting up a PQM too... that's one more thing on my 2009' todo list. | 22:21 |
| LarstiQ | jbalint: neither do I | 22:28 |
| LarstiQ | jbalint: if I add that file to a branch locally, it sees it as text | 22:28 |
| LarstiQ | jbalint: how about the other version it is conflicting with? | 22:29 |
| jbalint | LarstiQ: is there any logging or something that would say why? | 22:29 |
| * LarstiQ looks at the code | 22:29 | |
| jbalint | LarstiQ: looks to be the same | 22:29 |
| emmajane | beuno, Hello. :) I have a question about the upload plugin for bzr: I'm wondering if it is possible to only one sub-directory instead of the whole working tree? | 22:34 |
| beuno | emmajane, hi! interesting you should mention that, I talked to vila about that yesterday | 22:35 |
| emmajane | heh :) | 22:35 |
| beuno | it's not currently, it will in the future | 22:35 |
| * emmajane nods | 22:35 | |
| beuno | want to file a bug? | 22:35 |
| emmajane | can do. | 22:35 |
| lifeless | http://paste.ubuntu.com/107500/ | 22:39 |
| lifeless | jam: ^ real figures | 22:39 |
| jam | lifeless: what is the "corpus" you are using? | 22:40 |
| jam | The current inventory xml? | 22:40 |
| * igc breakfast | 22:40 | |
| jam | Or the ones I uploaded to tungsten? Or ??? | 22:40 |
| emmajane | beuno, Ok, it's pretty terse, but I've filed a bug. Hopefully it makes sense. :) | 22:44 |
| === bac is now known as bac_afk | ||
| Peng_ | lifeless: ping | 22:56 |
| lifeless | jam: my bzr repo's inventories | 22:58 |
| lifeless | jam: haven't got the test solid enough to move onto the ones you uploaded yet | 22:59 |
| lifeless | hi Peng_ | 22:59 |
| jbalint | what is file_id | 22:59 |
| Peng_ | lifeless: You pinged me a couple days ago? :) | 23:00 |
| garyvdm | jbalint: Each file has a file_id that remains contain even if you rename the file. | 23:16 |
| garyvdm | *constant | 23:16 |
| jbalint | garyvdm: alright, and thats not changing if you have a new rev, right? | 23:16 |
| jbalint | is there any way to show the id for a given file? | 23:16 |
| garyvdm | right | 23:16 |
| garyvdm | Not sure - other than through code. | 23:17 |
| garyvdm | jbalint: bzr status --show-ids | 23:18 |
| lifeless | Peng_: yesterday :) | 23:18 |
| lifeless | Peng_: I was going to ask if bzr-search was fast enough again now | 23:19 |
| lifeless | jbalint: bzr inventory --show-ids | grep filename | 23:19 |
| jbalint | thanks!, so if i have 6636@bce1ec22-edf6-0310-a851-a6aae2aa6c29 , does the "6636@" represent something specific or is that just an arbitrary path of it | 23:20 |
| davidstrauss | Is there a non-ancient RPM for RHEL5? | 23:21 |
| lifeless | jbalint: they are uuids, no meaning at all | 23:21 |
| jbalint | lifeless: sorry i meant the parts before uuid, with the "@" symbol | 23:22 |
| lifeless | jbalint: its all the uuid | 23:23 |
| mwhudson | igc: i wonder if you're going to end up caching the merge-sorted revision graph | 23:42 |
| mwhudson | (i think this can be updated on the introduction of new revisions in O(number of new revisions)-ish) | 23:42 |
| Peng_ | lifeless: Oh. I dunno. I've only indexed a few small branches, so I haven't paid much attention. | 23:46 |
| Peng_ | lifeless: Wait, I did index like 30 small branches (switching from the old to new index format), but I don't remember how that went. | 23:46 |
Generated by irclog2html.py 2.7 by Marius Gedminas - find it at mg.pov.lt!