| mgz | morning! | 08:00 |
|---|---|---|
| vila | mgz: hey ! | 08:01 |
| vila | mgz: already read your proposal for paths from env, will review shortly | 08:01 |
| mgz | thanks vila | 08:04 |
| vila | mgz: done, update pending, will reboot shortly | 08:42 |
| mgz | thanks vila! | 08:45 |
| vila | mgz: thanks to you, that proposal is really good | 08:46 |
| vila | jelmer: so you fixed bug #pipi :) | 09:13 |
| vila | jelmer: wait, no, you finished the fix from Riddell (the bug number is still funny though ;) | 09:14 |
| mgz | ...isn't LGPL entirely pointless for python? | 09:15 |
| vila | no idea | 09:16 |
| vila | mgz, jelmer : standup ? | 09:16 |
| mgz | standup now if jelmer's around would be good, I need to nip out over lunch | 09:16 |
| vila | k, let's see when he comes up | 09:17 |
| mgz | jelmerctl start | 09:19 |
| vila | jelmerctl alarm ring | 09:19 |
| jelmer | hi vila, mgz | 09:22 |
| vila | It Works !!!! | 09:22 |
| jelmer | I'll be right there | 09:22 |
| jelmer | :) | 09:22 |
| mgz | :) | 09:23 |
| vila | jelmer, mgz: pad created, ready when you are | 09:28 |
| jelmer | mgz: join us? | 09:32 |
| mgz | nearly with you, too many tabs to close | 09:33 |
| jelmer | mgz, vila: bug 881142 | 10:03 |
| ubot5 | Launchpad bug 881142 in Bazaar "AssertionError: unversioned parent while creating working tree using pypy" [Medium,Confirmed] https://launchpad.net/bugs/881142 | 10:03 |
| zyga | hi http://paste.ubuntu.com/768793/ | 10:06 |
| zyga | I got this on precise just now | 10:06 |
| zyga | is this known? | 10:06 |
| jelmer | mgz: ^ | 10:14 |
| jelmer | zyga: please file a bug | 10:14 |
| jelmer | zyga: we'll assign it to mgz :) | 10:14 |
| zyga | jelmer, will do | 10:17 |
| zyga | bug 903639 | 10:20 |
| ubot5 | Error: Launchpad bug 903639 could not be found | 10:20 |
| zyga | meh, private bug reports | 10:21 |
| zyga | jelmer, mgz: ^ | 10:21 |
| jelmer | zyga: thanks | 10:30 |
| jelmer | mgz: ^ | 10:30 |
| mgz | zyga: looks from the traceback like fallout from me removing some default options, should be easy to fix, thanks | 10:30 |
| zyga | mgz, this bug is highly annoying, I'd love to use a beta/trunk just to get rid of it | 10:31 |
| zyga | on the similar topic, when using bzr pressing tab for the first time takes a good 5-10 seconds to finish, have you seen this yourself? I think it's related to one of the foreign vcs plugins (perhaps svn, I did some digging around this a few months ago but my memory might be faulty now) | 10:32 |
| jelmer | zyga: that's the hard disk cold cache, python loads a lot of stuff on startup | 10:33 |
| zyga | jelmer, I don't think so, it happens all the time throughout the day, it's not just pure disk cache (I can trigger this by going to another directory and pressing tab a few times) -- if anything it is related to a repository/working tree/branch | 10:34 |
| zyga | jelmer, and I'm 100% sure it does not happen if I get rid of all the foreign vcs plugins | 10:34 |
| zyga | (I remember this being x10-100 slower on windows when using a large repository) | 10:35 |
| zyga | anyway | 10:35 |
| zyga | separate bug | 10:35 |
| zyga | I can scratch my itch when tab works again | 10:35 |
| jelmer | zyga: the foreign plugins only update a few dictionaries during bzr loading | 10:35 |
| jelmer | zyga: so I'd be surprised if they actually have an impact on startup overhead | 10:36 |
| jelmer | unless the bash_completion script is doing something weird | 10:36 |
| zyga | jelmer, interesting, I'll try to measure this sensibly if I can get tab complete to work | 10:36 |
| mgz | zyga: the issue there is I'm not sure which plugin has the problem option | 10:36 |
| zyga | jelmer, I'm 100% sure it's not as nice as you say, perhaps the interactions are less trivial than I thought | 10:36 |
| zyga | jelmer, but pure bzr was lightning fast on tab complete last time I've checked | 10:37 |
| zyga | mgz, I can help you track this down | 10:37 |
| zyga | mgz, is there a way to switch plugins on and off one by one? | 10:37 |
| mgz | vila: ^ | 10:37 |
| jelmer | zyga: set BZR_DISABLE_PLUGINS=name1:name2:name3 in the environment | 10:38 |
| zyga | jelmer, ok, let's try this | 10:38 |
| zyga | jelmer, I'm getting plugin names from the output of `bzr plugins` | 10:38 |
| jelmer | zyga: nevermind, I see what's going on here | 10:38 |
| zyga | oh | 10:39 |
| jelmer | zyga: bash-completion is triggering the loading of all plugins | 10:39 |
| zyga | jelmer, It happens when I keep the 'git' plugin | 10:40 |
| zyga | jelmer, disabling it makes tab work | 10:40 |
| * zyga keeps digging | 10:40 | |
| zyga | yup | 10:41 |
| mgz | okay, so, you can redo the bash-completion script sans plugins with: | 10:41 |
| zyga | only git seems to be affected | 10:41 |
| zyga | $ BZR_DISABLE_PLUGINS=git bzr bash-completion | 10:41 |
| zyga | mgz, this works | 10:41 |
| jelmer | zyga: can you try with bzr-git trunk? | 10:41 |
| zyga | jelmer, sure, just a moment | 10:42 |
| zyga | do I need to get rid of the packaged plugin or will ~/.bzr/plugins take priority? | 10:42 |
| jelmer | zyga: ~/.bazaar/plugins takes priority | 10:42 |
| zyga | good | 10:42 |
| vila | this is controlled by BZR_PLUGIN_PATH | 10:43 |
| * zyga branches lp:bzr-git | 10:43 | |
| zyga | jelmer, git trunk works | 10:44 |
| jelmer | zyga: it works and it doesn't slow things down, or it just works ? :) | 10:44 |
| * zyga thinks that bzr needs firefox-style plugin compatibility system where plugins are NOT loaded if they are not marked as supporting certain version of bzr | 10:45 | |
| zyga | jelmer, I'm just checking plain tab working | 10:45 |
| zyga | jelmer, let me check speed stuff now | 10:45 |
| jelmer | zyga: we have that actually, but it's up to plugins themselves to sign up for that | 10:45 |
| zyga | jelmer, perhaps it would be saner to swap that responsibility | 10:46 |
| * jelmer files bug 903650 | 10:48 | |
| ubot5 | Launchpad bug 903650 in bzr-builddeb "loads lots of modules in top-level of cmds module" [Medium,Triaged] https://launchpad.net/bugs/903650 | 10:48 |
| mgz | zyga: so, can run for each of those plugins in your list: | 10:50 |
| mgz | `bzr bash-completion --plugin launchpad >/dev/null` | 10:51 |
| zyga | mgz, sure | 10:51 |
| mgz | with 'launchpad' replaced in turn with a plugin | 10:51 |
| mgz | and see which one throws the error | 10:51 |
| mgz | (if any are very noticiably slower that's also interesting) | 10:51 |
| zyga | mgs, no crashes | 10:54 |
| zyga | all seem fast now | 10:55 |
| mgz | ...is that with any of the plugin envvars set? | 10:57 |
| mgz | I'm trying to work out which plugin I need to update, so I want the error :) | 10:57 |
| zyga | mgz, no, that's without any special environment | 10:59 |
| zyga | mgz, you probably want to look at the git plugin as I indicated above | 10:59 |
| mgz | ah, I did actually change bzr-git | 11:00 |
| mgz | so updating that would have been enough | 11:00 |
| * mgz wasn't following closely enough :) | 11:00 | |
| zyga | yes, it seems to be enough | 11:02 |
| * jelmer will look at doing another bzr-git release | 11:08 | |
| vila | wgz: when you get back, down to 4 failures on babune's windows slave, expected or just lucky ? | 12:09 |
| johan | Hi, I'm having a problem with a bzr repository of mine: | 12:11 |
| johan | $ sudo bzr update | 12:11 |
| johan | All changes applied successfully. | 12:11 |
| johan | bzr: ERROR: An inconsistent delta was supplied involving 'gdm/failsafeBlacklist', 'failsafeblacklist-20101011211133-ux797y0aieyjrmnf-718' | 12:11 |
| johan | How can I solve that issue? | 12:11 |
| vila | johan: bzr version ? | 12:12 |
| johan | vila: 2.4.2 | 12:12 |
| johan | format 2a of the branch | 12:12 |
| vila | hmm, better file a bug, we fixed some inconsistent delta bugs lately but 2.4.2 is recent enough to include them | 12:14 |
| vila | you may try a 2.5 beta to be sure | 12:14 |
| johan | do you know the ppa name in your head? | 12:14 |
| vila | johan: also, .bzr.log will probably contain more detailed data that should help diagnosing the issue | 12:15 |
| johan | vila: https://bugs.launchpad.net/bzr/+bug/855155 | 12:15 |
| ubot5 | Ubuntu bug 855155 in Bazaar "InconsistentDelta error when using bzr update" [High,Confirmed] | 12:15 |
| johan | less | 12:15 |
| johan | oops :( | 12:15 |
| * vila blinks, kiko ? Is that you hiding behind johan ? You've got the *exact* same file reported in the error | 12:16 | |
| vila | including the file-id... | 12:17 |
| johan | vila: I'm not kiko, but it's the same repository | 12:17 |
| vila | hehe | 12:17 |
| johan | vila: I added the relevant parts from .bzr.log to that bug | 12:18 |
| vila | johan: did you try bzr repair-workingtree as suggested in the comments ? (Keeping a copy of .bzr/checkout/dirstate just in case ?) | 12:18 |
| vila | johan: is that a public repo ? | 12:18 |
| johan | vila: yes, I tried that, it does not work | 12:19 |
| vila | ok, mention that in the bug report, that will help | 12:19 |
| vila | ... others | 12:19 |
| johan | vila: nope, it's /etc of a server I'd rather not expose the configuration in public for | 12:19 |
| vila | hmm | 12:19 |
| vila | anything special about this repo ? stacking ? | 12:20 |
| vila | johan: can you paste bin an ls -lR of .bzr on paste.canonical.com ? (.bzr contains only bzr stuff, nothing confidential should be exposed by an ls) | 12:21 |
| johan | just a sec, checking 2.5 beta | 12:22 |
| vila | johan: and do you know if kiko find a way out for his own case ? | 12:22 |
| vila | johan: sure, waiting | 12:22 |
| johan | vila: it's the same case, we both maintain the same server | 12:22 |
| vila | ok, 'bzr st' paste too ? | 12:23 |
| vila | or is status already failing in this setup | 12:23 |
| vila | maxb: 2.5b4 is out, could you update the beta ppa ? | 12:24 |
| johan | vila: http://paste.ubuntu.com/768887/ | 12:24 |
| johan | vila: and http://paste.ubuntu.com/768889/ for bzr st | 12:25 |
| johan | g | 12:25 |
| johan | gotta run, but I'll be back in 2h | 12:26 |
| vila | johan: let us know when you're back | 12:27 |
| vila | johan: just looking at your pastes, the first question that comes to mind is: is there a gdm/failsafeBlacklist in the tree ? | 12:30 |
| vila | johan: the second one is: it's weird to see a file-id with '-20101011211133' and no pack file around this date (but may be it just get repacked into a more recent one), | 12:31 |
| vila | the '-718' hints at a massive 'bzr add' (including at least 718 files) but that doesn't mean this get committed | 12:32 |
| vila | johan: there are several things we can try to 1) get you out the problem, 2) better diagnose what is happending, but both need your hands ;) | 12:33 |
| jml | I've got python-bzrlib 2.4.1-1ubuntu1 installed, but it doesn't come with bzrlib.tests. | 13:00 |
| jml | Which is annoying, since I'm using code that depends on bzrlib.tests (lp:udd, fwiw) | 13:00 |
| maxb | jml: apt-get install python-bzrlib.tests | 13:20 |
| jml | maxb: wow. thanks. | 13:20 |
| johan | vila: there's no gdm/failsafeBlacklist in the tree | 14:25 |
| johan | revisioned or not | 14:25 |
| vila | johan: hmm, there was one at some point apparently | 14:26 |
| vila | johan: what does 'bzr rm --keep gdm' says ? | 14:27 |
| vila | johan: no wait, | 14:27 |
| vila | johan: is 'gdm' still versioned (in itself or because other files into it are versioned) ? | 14:27 |
| === yofel_ is now known as yofel | ||
| johan | vila: gdm is versioned | 15:08 |
| johan | gdm/failsafeBlacklist was versioned in revno 1 | 15:09 |
| johan | $ sudo bzr rm --keep failsafeBlacklist | 15:09 |
| johan | gdm/failsafeBlacklist is not versioned. | 15:09 |
| johan | bzr log -p gdm|pastebinit - -> http://paste.ubuntu.com/769040/ | 15:10 |
| johan | current revno is 306 fwiw | 15:10 |
| * vila scratches head | 15:11 | |
| vila | johan: what happens if you do 'bzr update' again ? | 15:12 |
| johan | All changes applied successfully. | 15:12 |
| johan | bzr: ERROR: An inconsistent delta was supplied involving 'gdm/failsafeBlacklist', 'failsafeblacklist-20101011211133-ux797y0aieyjrmnf-718' | 15:12 |
| johan | reason: Unable to find block for this record. Was the parent added? | 15:12 |
| vila | bzr missing ? | 15:12 |
| vila | err, what does 'bzr missing' says ? | 15:12 |
| vila | say even | 15:12 |
| johan | Using saved parent location: /etc | 15:13 |
| johan | Branches are up to date. | 15:13 |
| vila | 'bzr info -v' ? | 15:14 |
| johan | http://paste.ubuntu.com/769047/ | 15:15 |
| johan | a different traceback | 15:15 |
| vila | yup | 15:17 |
| vila | 'bzr check' ? | 15:17 |
| vila | could be long, heavily depends on revision graph size and repository size, but /etc.. shouldn't be that big | 15:17 |
| johan | Checking working tree at '/etc'. | 15:27 |
| johan | Checking branch at 'file:///etc/'. | 15:27 |
| johan | Checking repository at 'file:///etc/'. | 15:27 |
| johan | checked repository file:///etc/ format RepositoryFormat2a() | 15:27 |
| johan | 347 revisions | 15:27 |
| johan | 3288 file-ids | 15:27 |
| johan | checked branch file:///etc/ format Branch format 7 | 15:27 |
| johan | that's the output of bzr check | 15:28 |
| lamont | bzr: ERROR: The dirstate file (DirState(u'/home/lamont/foo/.bzr/checkout/dirstate')) appears to be corrupt: failed to find trailing NULL (\0). Trailing garbage: '\n' | 15:31 |
| lamont | is there a way to clean that up, I wonder? | 15:31 |
| jelmer | lamont: "bzr repair-workingtree" might help | 15:32 |
| jelmer | vila: the issue johan is running into sounds like a transform issue? | 15:33 |
| lamont | jelmer: what is that going to do to the working tree? | 15:33 |
| lamont | bzr: ERROR: unknown command "repair-workingtree" | 15:33 |
| jelmer | lamont: its help probably describes it better than I can | 15:33 |
| jelmer | lamont: it's a fairly recent command | 15:33 |
| jelmer | lamont: another alternative is to rm -rf .bzr/checkout, and then run "bzr co" | 15:34 |
| jelmer | but that might move some of your existing files that have changed out of the way | 15:34 |
| lamont | ew | 15:34 |
| * lamont starts with a backup | 15:35 | |
| mgz | lamont: if you have lots of file metadata changes you care about, you have an issue, but just checking out the most last rev somewhere else and copying over the files in your tree would cover most things | 15:35 |
| vila | jelmer: like a symlink -> dir issue you mean ? | 15:35 |
| vila | lamont: or checkout somewhere else and copy the .bzr/checkout/dirstate only, then do 'bzr st' | 15:36 |
| lamont | I saved the tree did the rm/bzr co, and then did the rsync --exclude=.bzr to bring it all back. bzr st is now clean | 15:37 |
| lamont | I'm going to guess that we managed to reboot the machine in the middle of something in the way of a commit or so | 15:37 |
| vila | lamont: sounds like a possible explanation | 15:38 |
| vila | lamont: we never have such reports though | 15:38 |
| vila | had | 15:38 |
| mgz | just during bzr st would be enough. dirstate isn't all that robust, but it's also easy enough to recover in most cases | 15:38 |
| mgz | vila: we had various ext4 reports, some of those were dirstate | 15:39 |
| vila | mgz: really ? I can remember only repository related ones... But Alzheimer... | 15:39 |
| jelmer | vila: IIRC repair-workingtree was added exactly for this reason | 15:42 |
| mgz | the mp for bug 898541 is sitting on its own crying, ever since it had a little blip from launchpad librarian dying... won't someone review him? | 16:12 |
| ubot5 | Launchpad bug 898541 in Bazaar " UnicodeEncodeError on mv of a deleted non-ascii file" [Low,In progress] https://launchpad.net/bugs/898541 | 16:12 |
| mgz | I'm really mad that I lost my text file with all my NULL_REVISION bug notes in it | 16:13 |
| mgz | must have put it under a branch that got rmrfed | 16:13 |
| mgz | spent a good half hour going through dupes and categorising failure types | 16:14 |
| hrw | bug 893495 again ;( | 16:32 |
| ubot5 | Launchpad bug 893495 in bzr-builddeb (Ubuntu) "Zero byte successful merge after error from dpkg-mergechangelogs" [Medium,Confirmed] https://launchpad.net/bugs/893495 | 16:32 |
| mgz | hrw: good (kinda), I wanted to look at that again and can't practically merge gcc locally | 16:36 |
| jelmer | mgz: I'll have a look | 16:38 |
| hrw | this time I handled it with 'bzr diff -c72 >72.diff', extracting changelog.diff, applying it by hand and merging changes by hand | 16:38 |
| mgz | a good start would be to set BZR_PDB=1 and see what this_lines, other_lines, and base_lines are and how they get generated | 16:39 |
| hrw | ok, will branch, revert change and do merge again with this var set | 16:41 |
| mgz | from last time, with the right THIS OTHER and BASE the merge goes fine, so the problem happens before passing things off to dpkg-mergechangelogs | 16:46 |
| hrw | dpkg-mergechangelogs: błąd: ss-970814-1 is not a valid version | 16:47 |
| hrw | basically bug is same | 16:47 |
| hrw | I exported BZR_PDB=1 and then did merge - no extra log outputed | 16:47 |
| mgz | hm, but you didn't get the UnicodeDecodeError? I was relying on that to break into the debugger at a handy place | 16:48 |
| hrw | http://pastebin.com/nsWC2uLF is whole output | 16:48 |
| mgz | you still have my hack around that problem from last time? basically, I want to know what the merge_changelog.py sees for THIS OTHER and BASE so we know why it's generating 0 byte output (that's till the end symptom, right?) | 16:51 |
| hrw | shit. indeed. I forgot about it | 16:51 |
| mgz | that's fine | 16:51 |
| mgz | if you also remove the shutil.rmtree at the bottom of that file | 16:51 |
| hrw | it was in bzr-builddeb package? | 16:51 |
| mgz | that will leave the tempfiles that dpkg-mergechangelog is having problems with in place | 16:52 |
| mgz | ^yup | 16:52 |
| mgz | you can leave the hack around in, it's harmless | 16:53 |
| hrw | 17:53 hrw@puchatek:b$ bzr branch -r71 lp:~hrw/ubuntu/precise/gcc-4.6/gcc-linaro-ci-native;cd gcc-linaro-ci-native;BZR_PDB=1 bzr merge lp:ubuntu/gcc-4.6 | 16:54 |
| hrw | this is all you need to reproduce | 16:54 |
| mgz | thanks hrw. | 16:55 |
| hrw | no problem | 16:55 |
| hrw | solving bug will help my work in ufutre | 16:56 |
| mgz | hrw: can you try this on your local bzr-builddeb? <http://pastebin.ubuntu.com/769149/> | 17:01 |
| jelmer | vila: urhg, we're reading the user identity from a "email" file ?? | 17:02 |
| hrw | sure | 17:02 |
| hrw | it will be /usr/lib/python2.7/dist-packages/bzrlib/plugins/builddeb/merge_changelog.py file? | 17:03 |
| mgz | yes. | 17:04 |
| mgz | what I expect on the merge: the new message added should be output, and then in /tmp there'll be a dir with 'deb_changelog_merge' in it containing the interestingly broken changelogs | 17:05 |
| hrw | test in progress | 17:07 |
| hrw | changelog.base | 17:16 |
| hrw | http://paste.ubuntu.com/769169/ | 17:16 |
| hrw | changelog.other | 17:16 |
| hrw | http://paste.ubuntu.com/769170/ | 17:16 |
| hrw | changelog.this | 17:16 |
| hrw | http://paste.ubuntu.com/769171/ | 17:16 |
| mgz | those look not unreasonable, and `dpkg-mergechangelogs changelog.base changelog.this changelog.other > changelog` produces something reasonable? | 17:20 |
| hrw | 18:16 hrw@puchatek:tmpgUvyzWdeb_changelog_merge$ dpkg-mergechangelogs changelog.base changelog.this changelog.other | 17:20 |
| hrw | dpkg-mergechangelogs: błąd: ss-970814-1 is not a valid version | 17:20 |
| mgz | the warning/error about ss-970814-1 is expected, does it also fill out the changelog file? | 17:22 |
| hrw | ss-970814-1 exists as package version | 17:23 |
| hrw | looks like at 20 August 1997 it was valid version | 17:23 |
| mgz | right, it exists, but debian doesn't like it | 17:23 |
| mgz | for me, I get the warning but I also get a correctly merged 'changelog' output | 17:24 |
| hrw | no, bzr does not like it | 17:24 |
| hrw | when I 'LC_ALL=C' failure is same (but in English) | 17:24 |
| hrw | changelog is never generated here | 17:25 |
| mgz | okay. what does `dpkg-mergechangelogs --version` say? | 17:25 |
| hrw | Debian dpkg-mergechangelogs version 1.16.1.2. | 17:26 |
| hrw | dpkg-devii dpkg-dev 1.16.1.2ubuntu3 Debian package development tools | 17:27 |
| mgz | oh, I forgot to ask, when you ran the merge, did my new message print out after the old error? | 17:27 |
| hrw | Packaging branch status: CURRENT | 17:28 |
| hrw | dpkg-mergechangelogs: błąd: ss-970814-1 is not a valid version | 17:28 |
| hrw | Successful merge, but empty file? Dodgy... | 17:28 |
| mgz | if so, there's a simple enough work around in bzr-builddeb that will help you. | 17:28 |
| hrw | so yes, it did | 17:28 |
| mgz | yeay, okay, will fix today. | 17:28 |
| hrw | übercool | 17:28 |
| mgz | first, I'll work out what they broke in the newer dpkg versions that's causing things. | 17:29 |
| mgz | *this | 17:30 |
| mgz | `bzr branch apt:dpkg` ... is still really neat | 17:32 |
| hrw | thanks | 17:34 |
| * hrw -> off | 17:34 | |
| mgz | ...then bzr-git nearly OOMs me to death | 17:43 |
| mgz | let's manually delete some caches and see if it can finish | 17:45 |
| jelmer | mgz: what are ou trying to branch? | 17:47 |
| mgz | dpkg | 17:47 |
| mgz | (Pdb) self._group_cache._value_size | 17:47 |
| mgz | 44979584 | 17:47 |
| mgz | bye bye | 17:47 |
| mgz | hm, that didn't get me my 50MB back, needed to chase refs | 17:49 |
| mgz | ...will have to give in for now and cancel to do incremental pull | 17:52 |
| jelmer | hah, commit over lightweight checkouts with pure HPSS \o/ | 17:55 |
| mgz | ehehe | 17:55 |
| mgz | urk, git:/ doesn't support -r incremental pull? | 17:56 |
| jelmer | mgz: nope, because you can't introspect the revision graph remotely | 17:56 |
| mgz | okay, I'll just have to get the packaging branch rather than upstream I guess | 17:56 |
| mgz | most of that mem usage was probably overhead, pulling from git to bzr shouldn't need local groupcompress caches | 17:57 |
| === supton is now known as supton|coffee | ||
| === supton|coffee is now known as supton | ||
| mgz | that was a pain, but I have repo. | 18:43 |
| mgz | `PERL5LIB=~/.local/share/perl5 ~/.local/bin/dpkg-mergechangelogs` | 18:43 |
| vila | jelmer: what email file ??? | 18:48 |
| mgz | vila: doesn't die in perl get you somehting other than 0 as a return code? | 18:51 |
| vila | mgz: not fully sure but it should | 18:51 |
| vila | mgz: on the other hand I think I remember than die can be caught... | 18:52 |
| mgz | oh, oh, whoops | 18:52 |
| mgz | the logic is bzr-builddep is `if retcode == 1: ... else: # assume all is well!` | 18:53 |
| mgz | -p+b | 18:53 |
| vila | mgz: yup, man perlfunc says: ptrints LIST to "STDERR" and exits with a non-zero value. | 18:53 |
| vila | geee | 18:53 |
| vila | I managed to make tyops while pasting... | 18:53 |
| mgz | :D | 18:54 |
| vila | anyway, that's followed by: If you need to exit the process with a specific exit code, see exit. | 18:54 |
| mgz | so, not dying on bad version numbers would be nice, as it doesn't in my older dpkg version, but this is nice and fixable in builddeb | 18:56 |
| vila | johan: still there ? | 19:15 |
| jelmer | vila: see bzrlib/config.py | 19:23 |
| jelmer | vila: we try to read the user identity from .bzr/branch/email | 19:23 |
| vila | ooooh, in the good old days you mean, not now ? | 19:24 |
| jelmer | vila: we still do | 19:24 |
| jelmer | vila: config.py:1400 | 19:24 |
| vila | ;_; | 19:25 |
| vila | jelmer: this is broken for remote branches right ? | 19:25 |
| vila | jelmer: this code should die and nobody should ever talk about it anymore | 19:26 |
| jelmer | vila: hehe | 19:26 |
| jelmer | vila: it's not broken for remote branches, it works | 19:27 |
| fullermd | Sounds like we need the ability to edit history :p | 19:27 |
| jelmer | vila: but it triggers VFS access | 19:27 |
| vila | jelmer: and who is able to create this file ? | 19:27 |
| jelmer | vila: "echo" ? :-) | 19:28 |
| jelmer | vila: we have tests that it still works | 19:28 |
| jelmer | vila: but I'm all in favor of killing it, too. | 19:28 |
| * vila bangs head | 19:28 | |
| vila | decoded with user encoding though :) | 19:29 |
| vila | I'm off, it makes me cry too much :) | 19:29 |
| vila | jelmer: sorry, by 'who' I was thinking about launchpad, you think it's allowed there ? | 19:30 |
| jelmer | vila: I doubt anybody is using it, but launchpad does allow creating that file. | 19:31 |
| vila | yeah, same here, I doubt anybody even knows about it (I'm sure I've seen this code but I managed to forget until you mentioned it ! Shame on you ! ;) Too bad lp allows it to be created... | 19:32 |
| * vila really off | 19:34 | |
| === Quintasan_ is now known as Quintasan | ||
| thomi | Hi - is there a way to import a branch from repository X into a sub-directory of repository Y and keep the history of those files from repo X? | 19:44 |
| jelmer | thomi: "bzr join" ? | 19:46 |
| * jelmer heads out | 19:46 | |
| thomi | jelmer: it seems like that only works for branches from the same repo? | 19:48 |
| fullermd | No, it works for any two. | 19:48 |
| fullermd | "from the same repo" doesn't really mean much anyway. | 19:49 |
| thomi | hmm, when I try, I get this: | 19:49 |
| thomi | NoSuchRevision: CHKInventoryRepository('file:///home/thomi/code/unity/.bzr/repository/') has no revision thomir@gmail.com-20111208204500-9v1r9owjaz1qu6aa | 19:49 |
| thomi | I must be doing it wrong ;) | 19:49 |
| fullermd | What command are you running? | 19:50 |
| thomi | bzr join subdir | 19:50 |
| fullermd | Well, that's a new one in me. | 19:51 |
| fullermd | Which branch is that rev from? | 19:51 |
| thomi | the target branch - i.e.- the 'subdir' | 19:51 |
| thomi | hmmm, I might try this with clean branches, see if I can reproduce it.... one second | 19:52 |
| fullermd | Mmm. Works in a trivial example I tossed together, with 2.4.2 and .dev. | 19:53 |
| thomi | yeah, it works for me when I start from scratch... | 19:54 |
| thomi | fullermd: filed bug: https://bugs.launchpad.net/ubuntu/+source/bzr/+bug/903906 | 20:13 |
| ubot5 | Error: ubuntu bug 903906 not found | 20:13 |
| Noldorin | hi jelmer, life | 20:28 |
| jelmer | hi Noldorin | 20:29 |
| jelmer | I have to admit, no lifeless on IRC would surprise me too :) | 20:29 |
| Noldorin | jelmer, haha yeah. curse him for making me tab-fail. | 20:29 |
| Noldorin | how's your work going anyway? | 20:29 |
| jelmer | hacking on HPSS, going well :) | 20:30 |
| jelmer | with a bit of luck bzr 2.5 won't need any VFS calls anymore for normal operation | 20:30 |
| Noldorin | jelmer, not familiar with HPSS. is it like software raid? | 20:32 |
| Noldorin | or a protocol maybe | 20:32 |
| Noldorin | ? | 20:32 |
| mwhudson | Noldorin: high performance smart server | 20:33 |
| Noldorin | mwhudson, not storage system? wikipedia tells me this :-S | 20:34 |
| Noldorin | hmm | 20:34 |
| jelmer | Noldorin: high performance smart server | 20:36 |
| Noldorin | what does it do? :-) | 20:37 |
| jelmer | Noldorin: it's what powers bzr+ssh | 20:37 |
| fullermd | Performs highly. | 20:37 |
| Noldorin | heh | 20:38 |
| Noldorin | fullermd, always a help :-) | 20:38 |
| * fullermd is a helper! | 20:38 | |
| mgz | jelmer: what's traditional to do if I want to get something changed that has a debian upstream? | 20:52 |
| mgz | file a bug against debian? just post the patch to the relevent ml? | 20:52 |
| jelmer | mgz: you mean something that is "debian native" ? | 20:53 |
| jelmer | mgz: a good bet is to file a bug in the debian bts and attach a patch | 20:53 |
| mgz | ...the fun thing with that is the bug is not actually present on my system | 20:56 |
| mgz | I'm not sure how well reportbug copes with that | 20:57 |
| jelmer | mgz: that's fine | 20:57 |
| jelmer | mgz: it'll ask you whether you're sure you want to file a bug, but you can just answer yes :) | 20:58 |
| jelmer | mgz: alternatively, you can send an email to submit@bugs.debian.org | 20:58 |
| Noldorin | bzr: ERROR: Could not acquire lock "(remote lock)": | 21:38 |
| Noldorin | jelmer, mgz any idea what this means ona bzr init? :-) | 21:38 |
| Noldorin | it's inside a symlink dir on windows | 21:38 |
| Noldorin | normal dirs work fine | 21:39 |
| Noldorin | not sure if it's to do with symlinks though... | 21:39 |
| Noldorin | or permissions or something else entirely | 21:39 |
| Noldorin | :-S | 21:39 |
| mgz | from inside cygwin? symlinks don't work gererally in bzr win32 certainly. | 21:40 |
| mgz | jelmer: still kicking? mind eyeballing a patch for me to see if I've done anything too stupid? | 21:42 |
| Noldorin | mgz, yeah, within cygwin | 21:47 |
| Noldorin | has to be to get ssh working heh ;-) | 21:48 |
| jelmer | mgz: sure | 21:48 |
| mgz | jelmer: http://pastebin.ubuntu.com/769461/ | 21:51 |
| Noldorin | mgz, recommend any alternative for windows/cygwin if i want to specify a custom base path via bzr+ssh? | 21:52 |
| Noldorin | also, can i manually defien custom prefixes like lp:foo without recompiling bzr? | 21:52 |
| mgz | Noldorin: see the suggestions from the other evening, bzr-bookmarks is probably simpler than playing symlink games | 21:53 |
| Noldorin | mgz, how does that work though? | 21:54 |
| mgz | that's for <http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=651993> | 21:54 |
| ubot5 | Debian bug 651993 in dpkg "dpkg-mergechangelogs fails if any changelog contains an invalid version" [Normal,Open] | 21:54 |
| mgz | mgz: try it and find out, it's not something I've ever needed | 21:55 |
| mgz | wait, that's me | 21:55 |
| jelmer | mgz: oh perl.. joy :) | 21:55 |
| mgz | Noldorin: ^, also send mail to the list as you do things, this stuff is under documented so your experiences are useful | 21:56 |
| mgz | jelmer: indeed, and try not to let the mixed tabs and spaces confuse you either :) | 21:56 |
| mgz | (I didn't really rearrange code just so I could remove some of those... honest) | 21:57 |
| Noldorin | mgz, lol you just self-highlighted :-) | 21:57 |
| mgz | it was an amusing line to do that on too :) | 21:58 |
| jelmer | mgz: it looks plausible :) | 21:58 |
| jelmer | mgz: I haven't done an in-depth review, but I'm sure buxy will | 21:59 |
| mgz | thanks, will post and see if I get suggestions | 21:59 |
| Noldorin | mgz, eh looks like a cool plugin. still doesn't help me provide two ssh users on my win server access to the same dir though :-( | 22:05 |
| jelmer | Noldorin: can't they just specify the same location? | 22:05 |
| Noldorin | jelmer, no. all paths are relative to the user home | 22:06 |
| mgz | hm. | 22:08 |
| mgz | okay, now the easy bit. | 22:09 |
| Noldorin | mgz, i guess it's something weird cygwin is doing? :-P | 22:13 |
| mgz | it seems very likely | 22:15 |
| mgz | there probably is a neat way around your issue, nothing's coming to mind currently though. | 22:15 |
| Noldorin | mmh... | 22:17 |
| poolie | hi all | 23:02 |
| jelmer | hey poolie, how was Queensland? | 23:07 |
| mgz | hey poolie | 23:10 |
| poolie | ah i didn't go quite that far this time | 23:13 |
| poolie | it was good though | 23:13 |
| poolie | how are you? | 23:13 |
| jelmer | I'm doing alright too | 23:17 |
| poolie | i need to miss our calls again tonight | 23:17 |
| poolie | for the canonical sydney xmas party | 23:18 |
| jelmer | that sounds like fun | 23:18 |
| poolie | yeah it should be | 23:19 |
| poolie | i think there are a few people who haven't met yet | 23:19 |
| jelmer | poolie: how many people are there in Sydney? I can only think of a handful | 23:20 |
| poolie | 12 are coming tonight, counting one guest | 23:22 |
| poolie | and with a few coming up from canberra | 23:22 |
| jelmer | ah, cool | 23:28 |
| mgz | okay, enough of debian changelogs for the day | 23:30 |
| mgz | I need some food. | 23:30 |
Generated by irclog2html.py 2.7 by Marius Gedminas - find it at mg.pov.lt!