[00:51] There's a bug open about that, https://bugs.launchpad.net/bzr/+bug/569361 I think. [00:51] Launchpad bug 569361 in Bazaar "Remembering an URL different from the one the user entered is surprising (affected: 3, heat: 18)" [Wishlist,Confirmed] [03:54] Anybody seen bzr-svn create bogus tags when pushing to SVN after merging from another bzr-svn branch? [04:10] TresEquis: I haven't, sounds like a good bug to file. [04:19] spiv: I would file it if I could figure out how to reproduce it [04:19] happened twice to me yesterday, but I'm not sure why /how [04:24] This checkin was a push from a local bzr branch to the bzr-svn checkout :parent [04:24] https://mail.zope.org/pipermail/checkins/2010-June/047200.html [04:24] followed immediately by creation of bogus tags: [04:24] https://mail.zope.org/pipermail/checkins/2010-June/047201.html [04:25] https://mail.zope.org/pipermail/checkins/2010-June/047202.html [04:25] etc [04:25] Hmm. :( [04:25] Does your local bzr branch have tags with those names in the 'bzr tags' output? [04:25] none of those tags ever existed in that project, nor any such releases [04:25] spiv: hmm, I think I wiped out the local checkout ;( [04:26] yup ;( [04:27] I have a half-baked theory that bzr might have been confused by an attempt to merge an unrelated branch [04:27] which didn't actually make any changes in my working tree [04:27] Oh, yes, that does sound plausible off the top of my head. [04:27] but maybe it messed up the tags bookkeeping? [04:27] * spiv takes a peek at the code [04:28] * TresEquis crosses his fingers [04:28] Hmm. [04:29] Yes, that does seem plausible, if you managed to get bzr to go as far as fetching revisions from the other branch into this one. [04:30] it seemed to try, then give up claiming "no common revisions" or something [04:31] Hmm, that doesn't sound right then. [04:32] I'm pretty sure tags are only updated after fetching the actual revision objects, and that can only happen after determining the revisions to fetch, which is when that error would happen. [04:32] It's possible there's a code path I'm not noticing, of course. [04:32] if it matters, the two trees both point back to the same SVN repository [04:32] just to different project areas in it [04:35] I wouldn't expect that to matter, directly. Well, that's presumably what allows bzr to know that it can even create those tags (because the revisions from the other repo are there), but doesn't address the mystery of why bzr/bzr-svn is mixing tags from an unrelated project. [04:35] all the branches (bzr-svn checkout, local branc) were inside a shared repo, if that matters [04:40] anyway, I will post a bug with as much information as I have [04:40] even though reproducing it seems wicked [04:41] That would be good, I suspect jelmer may be able to guess the bug :) [04:45] I don't suppose anyone knows much about configuring apache to use active directory? If you do, https://answers.launchpad.net/bzr/+question/113185 could use your help. [04:46] Posted here: https://bugs.launchpad.net/bzr-svn/+bug/589514 [04:46] Launchpad bug 589514 in Bazaar Subversion Plugin "Bogus tags created after failed merge attempt (affected: 1, heat: 6)" [Undecided,New] [04:54] Thanks for the sounding board, spiv [05:19] spiv, thanks for the import test and patch [05:21] spiv: poolie: you guys might benefit by lurking in #ubuntu-devel, amongst other channels. Just had a query about udd reliability there - I don't think most folk having bzr related things go wrong will think to come here in the first instance. [05:22] Hmm, I'm usually in there. I need to poke irssi harder to make that stick I guess. [05:36] yeah likewise [05:36] thanks for the reminder and for catching it [05:45] It's very wet today. [05:45] mm it is [05:45] uhuh === oubiwann is now known as oubiwann_ [05:52] poolie, lifeless: regarding ignore handling. while i prefer 'fail early' i am ok with warning for 'ignore', 'ignored', 'ls' and 'st' as these command don't change anything. [05:53] doing a warning for 'add' seems scary to me as the user might end up adding unwanted stuff to the repo. [05:53] he could revert but then he may not notice and just add more revisions. [05:54] we have seen tickets like thing regarding whoami guessing and .moved files being added. [05:54] i was hoping to catch jam but i guess its late in his timezone. [05:55] i think if you explicitly try to add an invalid file that should certainly fail [05:56] poolie: spiv: check my facebook feed - not wet today :) [05:56] it's been very nice here today too [05:56] poolie: not invalid file; invalid .bzrignore making the regex compilation fail [05:56] you have better mountains though [05:57] you're in a mountain! [05:57] i think one interesting case is having a file with a bizarre name generated by a build process that you can't change [05:57] ah sorry, different bug [05:57] poolie: i am thinking if user does 'bzr add foo', it should work irrespective of bad ignore pattern. however a 'bzr add' should fail if there is a bad pattern in ignore files. [05:57] in that case i think it's within the person's power to fix it before doing anything else? [05:57] poolie: certainly bad files in the tree shouldn't stop bzr being usable as long as they aren't versioned [05:58] poolie: well thats what I've been arguing [05:58] parthm, right with 'add foo' (foo not a directory) we shouldn't need to even think about ignores [05:58] well that's nice we agree then :) [05:58] jam and vila have expressed an interest in just warning and not stopping [05:58] poolie: so you and I agree, jam and vila appear to agree with each other ;P [05:59] and they're both asleep... [05:59] poolie: if a user is hoping to ignore 'x.zz' and it gets added. he may not notice and end up adding a few more revisions. [05:59] ... so ... _-) [05:59] there is discussion in the bug [05:59] personally, I've said my bit - and any improvement over a backtrace is an improvement [06:00] so, I'm -> loom stuff for a bit more, then EOD [06:00] incremental improvements and working code generally get my approval [06:00] parthm: what time is it for you, now ? [06:00] ok [06:00] i'm going to concentrate on reviews for a bit [06:01] its 10:30 am ... i am planning to start working on a new patch for the ignore pattern issue. [06:01] you should look at my scenery porn first :) [06:01] poolie: ^ [06:01] * poolie coughs [06:01] that is very pretty though [06:02] hmm, facebook seem to discard lots of resolution. [06:02] interesting choice of foreground [06:02] it *was* a 4K by 3K [06:02] oh from what camera? [06:02] I have some others without anything but water in foreground [06:03] coolpix s8000 [06:03] has a 10x optical zoom, which is pretty nice [06:03] nothing compared to your beasty [06:03] but I wanted something I can hold for extended periods [06:04] the other ones though aren't as dramatic on the mountains [06:04] and I thought the prosaic foreground item was fun [06:09] morning all. [06:12] hi mgz [06:13] spiv, btw, you're pilot next week [06:13] i'm going to empty it a bit today if possible [06:13] Thanks :) [06:35] mgz, thanks for your review of the walkdirs patch [06:36] happened to be something I'd just been looking at from the other end in testtools, and before that with vila in bazaar.tests._rmtree_temp_dir [06:37] if we've got a function that wants to guarentee unicode (or utf-8) outputs, and has a posix filesystem as its input, something has to give [06:39] throwing a clear error like in the merge proposal is an improvement [06:39] yes [06:45] ah, that's what I was doing, commenting on one of you bugs about this [06:45] * mgz finishes typing that [06:51] i wonder if i have some still unpushed developer docs about handling unicode [06:52] we could try to explain the general approach more [06:53] did I write anything for my nonc bits... [06:53] hm, just: [06:53] +No API should take '``str`` or ``unicode``' expecting to use ``isinstance`` to [06:53] +tell them apart. Text that may need to include non-ascii characters on some [06:53] +platforms, such as filenames or error messages, should be decoded to unicode [06:53] +at the earliest opportunity. Much of this will also need looking at carefully [06:53] +when considering a py3k port. [06:54] which isn't all that useful. [07:00] mgz, "use instance to tell them apart ... without a very good excuse" :-) [07:00] such as coping with a platform api that can return either [07:00] right. [07:00] we have to cope with such problems, don't want to propogate them [07:02] i've been meaning to write a tool that auto-fixes filenames [07:02] by guessing what encoding they're in and changing them to utf-8 [07:02] there are libraries to do the guessing [07:02] maybe such a tool exists [07:03] also foreign branches, I filed a bug against bzr-git the other day while trying to track down a different issue [07:03] a sensible guess is the right thing sometimes. [07:04] lifeless, so what did we finally agree about sphinx in pqm? we'll try to backport it? [07:04] bug 587074 it twath. [07:04] Launchpad bug 587074 in Bazaar Git Plugin "Branching tree with non-ascii filenames fails (affected: 1, heat: 6)" [Medium,Triaged] https://launchpad.net/bugs/587074 [07:11] hi all [07:13] hi vila [07:13] hi there vila [07:13] \o/ [07:13] are your machines feeling better? [07:14] yes, and an additional disk for backups is on its way [07:15] Of course I had a kernel panic on OSX yesterday just to keep me on my toes, but I ignored it because enough is enough :) [07:15] good idea :) [07:15] i'm still waiting for my rebuilt machine [07:16] poolie: errr, when did it broke ? [07:16] wow, two weeks ago now [07:16] but it took a while to conclude what was wrong [07:17] wow, I was lucky enough to get mine so quickly then [07:18] yeah, the diagnosis for mine went a bit fast because it was locking quite fast [07:18] but in retrospect, I'm now convinced that the failure started manifesting itself long ago, but only once in a while (like once a month) [07:19] I'm toying with the idea of using a remote log facility for cases like that (fullermd mentioned raid but I can't do that on the imac) [07:20] But that's low priority, backups are better :) [07:21] so vila if we started testing python2.4 only in babune, do you think that would be fairly safe? [07:21] Sure, let me check hardy's default version [07:22] Unfortunately lucid doesn't support 2.4 anymore... [07:23] one concern I've got about that is Vincent's too good at just fixing things. when pqm fails, the patch submitter sees the fallout so there's some community learning about what isn't 2.4 safe. [07:23] that's true [07:23] hmm, 2.5 is the default [07:23] yes [07:23] hehe don't make me blush, [07:24] however we could make him put coding-style additions up when he fixes something [07:24] The thing is it's still faster to fix things than finding the time to configure email sending on errors [07:25] i think fixing them is fine [07:25] but it should be visible somehow [07:25] so hardy's default is 2.5, I can either add a specific run for 2.4 or just force 2.4 on hardy (but that feels wrong since it's not the default config used by hardy's users and that's wht I want to test primarily) [07:26] I try to at least file bugs with a babune tags when I fix such things [07:26] s/tags/tag/ [07:26] if you put up a mp adding to doc/developers/coding-style.txt and say why you need the addition [07:26] that will help [07:26] someone did that [07:26] recently [07:27] i'd care more about getting 2.4 on hardy than i would about retesting 2.5 on both hardy and jaunty [07:27] ha no, the best solution for python2.4 is to add a centos/redhat slave [07:27] what's 'selftest-matrix' again? [07:27] oh that would be better [07:27] i'm not paying for a RHEL licence though :) [07:28] the old way to run on all slaves which was confusing as all tests were consolidated there [07:28] I will delete it once I get a blue babune including windows [07:29] It's unfortunate that the default view is the 'all' one which by definition includes all jobs whether they are relevant or not (debug-* for example have a specific focus by definition) [07:29] And by the way, there are tooltips on the colored icons [07:30] hmm, no example there, but grey can mean either disabled or aborted [07:30] selftest-matrix is disabled because it's obsolete [07:31] and here I was thinking you were testing bzr on human batteries [07:31] template-selftest is disabled because it's not intended to be run but is used by selftest- to keep some definitions unique [07:31] mgz: what did I tell you about rule #1 ? [07:32] there's no such thing as babune? [07:32] or was that rule #2... [07:36] thre is no such thing as human batteries powered selftest :) === radoe_ is now known as radoe [08:11] poolie: I don't know what the consensus was [08:18] if you're talking about sphinx then i think it was that we'd try the backport [08:26] That was my impression too. I don't recall anyone objecting to that suggestion, at least. [08:45] lifeless, i don't want to be snarky but pqm failures now seem unreadable [08:45] since they lose the crlf distinction [08:45] i guess i should write an alternate encoding [08:49] subunit thing? what kind of unreadable? [08:50] I guess I need to try out my new powers and see what sort of mail sends soonish. [08:50] anyway, if it's because of \r in test output I might squash that at the testtools level [08:51] because it's a good way to break terminal output too. [08:52] >>> raise ValueError("\rgotcha!") [08:52] Traceback (most recent call last): [08:52] File "", line 1, in ? [08:52] gotcha!ror: [09:04] poolie: the fix is coded, see the lp rt queue for the request to deploy it [09:05] poolie: (fix here meaning to send as an attachment) [09:05] mgz: there is a bug open on subunit to use a more robust framing [09:05] right, but my point was random control characters are bad anyway [09:07] lifeless, that's nice [09:08] this is rt39555? [09:08] well, obviously [09:09] poolie: something like that, I can look it up if needed, but it should be pretty obvious [09:14] poolie: aaron wrote a sketch for me @ UDS, I polished and prepped, needs deployment [09:15] ok, i bumped it up for attention [09:17] a better protocol would be nice [09:17] so would a summary in the body of the mail; but I figured getting the terrible bahviour sorted was the high priority [09:18] The ‘bzr-buildpackage’ tool is capable of doing the equivalent of an export, but taking the current uncommitted files from the working tree. [09:18] is that a capability of the export command? [09:18] I want to be able to export the current what-would-be-committed working tree state. [09:19] there was a bug for that [09:19] i think someone fixed it? [09:19] but maybe not [09:20] $ bzr version | head -n 1 [09:20] Bazaar (bzr) 2.1.1 [09:20] $ bzr export --help | grep uncommitted [09:20] $ [09:28] i might sign off soon [09:49] mgz: so [09:49] mgz: matchers; did you look at the exception matcher in testrepository ? [09:54] urgh argh eeerk, ssl fingerprint do not match wth ! [09:54] fetchmail: despite my thanks for your wonderful support all those years: I hate you! [10:07] ayan: hi [10:08] ayan: what timezone are you in ? [10:46] well gnight y'all [10:58] darn, came back too late [10:59] will have to catch lifeless in another cycle. [11:01] mgz: 'morning Martin [11:01] morning jelmer. [11:31] what does the '?' indicate in 'bzr status'? i am getting a status of '? .bzrignore' for a test output. [11:32] parthm: unknown file (not versioned, not ignored) [11:32] jelmer: thanks :) [11:34] parthm: ‘bzr help status-flags’ [11:35] bignore: neat. i didn't know about that. [11:35] sorry. i meant bignose :P [11:35] you may also want to know about nick completion in your IRC client :-) [11:35] bignose: yes. i think i should start using it :) [11:36] yup. it works :) [11:36] heh [11:36] parthm: for more interesting topics, ‘bzr help topics’ [11:37] bignose: yes. i have used that one. somehow i missed status-flags. [11:37] thanks. [11:44] hi everyone [11:45] does anyone know if there is an official policy for how bzr deals with ghost revisions? [11:46] hi peitschie [11:46] peitschie: Can you expand? Ghost revisions are just there (or rather, they aren't ;-) [11:46] hi jelmer :) [11:47] i'm chasing up 3 crashes that happen in qbzr tools... all related to ghost revs [11:47] most of the time bzrlib throws errors if the revision doesnt exist [11:48] in some cases i think this behaviour is incorrect (e.g., in repository.py def _get_revisions(self, revision_ids) for example) [11:48] but just wondering if there was any disctussion about better ways of dealing with these? [11:49] in some cases... qbzr can't possibly work around the iszsue, because it is calling a low-level bzrlib call with a bunch of revisions, which may or may not be ghosts [11:49] peitschie: in general the policy is to raise exceptions when you ask for a single revision that doesn't exist [11:49] peitschie: for calls that return multiple revisions such as get_revisions() it should probably either yield None or ignore the revision altogether if it's not present [11:50] peitschie: you shouldn't be calling _get_revisions directly though [11:50] jelmer: sorry... ur right... it is calling get_revisions :) [11:55] jelmer: would it be bad in your opinion to return a partially filled Revision object with a special "missing=True' property? [11:58] peitschie: In that case I'd opt for a GhostRevision object or something like that [11:59] jelmer: ah.. That's a good idea! I'll introduce one of those === Meths_ is now known as Meths === nailuj24_ is now known as nailuj24 [14:01] has any body seen the following? (google doesn't know anything about it): ErrorFromSmartServer: Error received from smart server: ('error', 'Internal check failed: Cannot add revision(s) to repository: missing chk node(s) for id_to_entry maps') [14:03] I did a reconcile on the server but that didn't help :( [14:14] amanica: are you using bzr-svn? [14:14] not in this case [14:14] do you think the plugin interferes? [14:15] amanica: not unless you're mirroring from an svn repo :). how many revs in your repo? [14:16] in my branch 200, in my repo much more [14:16] I'm gonna try to upgrade the bzr on the server from 2.0.1 to 2.1.2 maybe that helps.. [14:17] hey marius! [14:17] how are you? [14:17] hey buddy mgz, I'm good thanks and you? [14:18] not too bad, sun is shining and lunch awaits. [14:18] I'm trying to get some work done, but things just keeps getting in my way :( [14:27] mgz: btw. congrats with being granted pqm access [14:31] Bazaar offers me a command to break a lock, but using the command doesn't work. [14:31] “If you're sure that it's not being modified, use bzr break-lock chroot-13269072:///bzr/collab-maint/comixcursors/comixcursors.debian/.bzr/branch/lock [14:31] but: [14:31] $ bzr break-lock chroot-13269072:///bzr/collab-maint/comixcursors/comixcursors.debian/.bzr/branch/lock [14:31] bzr: ERROR: Unsupported protocol for url "chroot-13269072:///bzr/collab-maint/comixcursors/comixcursors.debian/.bzr/branch/lock" [14:32] so presumably Bazaar should either gain the ability to do what it's offering to do, or not offer it. [14:33] bignose: please file a bug [14:33] amanica: I have yet to try it out though, need to get one of your merge requests ready to land so I can break it :) [14:34] bignose: this is on launchpad, right? [14:34] I don't (yet) have a Launchpad account, I'd appreciate someone filing it on my behalf. [14:34] mgz: no, on Alioth [14:34] mgz: cool, will do :) [14:35] oh. you can still un-root the path to something you can access right? [14:35] I think I did that when I had a similar issue on launchpad [14:35] ...or maybe I deleted the branch and pushed again, don't recall. [14:35] I can work around the problem. but presumably the lock will remain until broken. [14:35] the bug is rather that the error message suggests a command that will never work. [14:35] what I mean is, can you give break-lock that url in a form it understands? [14:36] I'm not disputing that the message is a bug. [14:36] bignose: try using ' bzr break-lock' on the URL you originally used to access the branch [14:36] mgz: hmm. you're suggesting that the problem is the error message is displaying the wrong URL, and a correct URL could be used? [14:36] right. [14:36] jelmer: does it need to go all the way to the ‘…/.bzr/branch/lock’ file? [14:37] bignose: no, that's not necessary (both should work) [14:37] or could I just refer to ‘:bound’? [14:38] perhaps, I'm not sure [14:38] worth a try :-) [14:38] (the reason I'm asking, rather than trying it, is that I've already broken the lock by SSH onto the remote machine. so I can't test these questions.) [14:38] I wasn't even aware the smart server over plain tcp worked on alioth these days.. [14:39] “plain TCP”? it's over SSH, I'm not sure if that's different from what you're saying. [14:39] it's different, I meant bzr:// [14:39] as opposed to bzr+ssh:// [14:40] okay. I've never tried the plain TCP protocol on Alioth. [14:44] nope, Alioth doesn't provide Bazaar plain TCP protocol. === IslandUsurper is now known as IslandUsurperAFK [16:52] team [16:52] is there any way to rescue the disconnected "bzr branch" command? [16:52] i have disconnecting net onnection [17:11] I don't think it's possible to resume bzr branch [17:11] shrini1, use a shared repositoru [17:11] repository even [17:12] it will save the revisions to it, and will continue branching just from the ones it doesn't have === IslandUsurperAFK is now known as IslandUsurper === ericmoritz\0 is now known as Guest33830 [20:46] how would I checkout out a particular revision of a bzr repo? (I've already pulled the branch and should have all the history ) [20:53] csgeek: bzr revert -r xxx [20:53] or if you want to make a new branch at an old revision, bzr branch -r xxx . ../b2 [20:55] thanks [20:55] nah.. just wanted to look at a particular revision. Just need to confirm something. Thank you