| Peng_ | jelmer: Or never mind. | 00:01 |
|---|---|---|
| jelmer | Peng_: pong | 00:02 |
| jelmer | Peng_: hmm? | 00:02 |
| Peng_ | Hmm, several levels of déjà vu. | 00:04 |
| Peng_ | jelmer: I've been having problems with bzr-svn 0.6 and Google Code recently: it asks for HTTP auth on the .bzr control files. But "svn+http" works, so never mind. :D | 00:05 |
| jelmer | Peng_: see the recent thread on the mailing list | 00:14 |
| Peng_ | jelmer: Ehh. Which one? | 00:15 |
| Peng_ | I'm a week behind on mail, so that'd be great if thre was only one new thread on the entire list, but... :P | 00:15 |
| Peng_ | jelmer: Oh, the fork thread? | 00:15 |
| jelmer | Peng_: yeah | 00:17 |
| jelmer | Peng_: the short summary is | 00:17 |
| jelmer | Peng_: bzr sends a POST request to see if the remote server provides a bzr smart server | 00:17 |
| jelmer | Peng_: But GOogle code responds to POSTs with a 401 Auth required reply | 00:17 |
| jelmer | and that triggers a username prompt on the bzr side | 00:18 |
| === bob2 is now known as Guest32269 | ||
| Peng_ | jelmer: Ahh, okay. Thanks. | 00:19 |
| === vxnick is now known as vxnick_ | ||
| === vxnick_ is now known as vxnick | ||
| === Guest32269 is now known as bob2 | ||
| === edcrypt is now known as edcrypt_ | ||
| SamB | is it just me or is the bundle-buggy web UI down ? | 02:08 |
| jam | SamB: it seems to be down | 02:19 |
| * SamB wonders if jelmer will vote for his http://thread.gmane.org/gmane.comp.version-control.bazaar-ng.general/56734 | 02:27 | |
| Peng_ | What's the mailing list's message size limit? | 03:04 |
| Peng_ | I wonder if that's why my message hasn't gone through. I think. | 03:04 |
| ub3rst4r | does anyone what the url is to mirror a branch thats hosted on sourceforge on to launchpad? | 03:48 |
| Peng_ | ub3rst4r: https://code.launchpad.net/+code-imports/+new | 03:51 |
| Peng_ | ub3rst4r: Oh, never mind. Ignore me. Go with what you're being told in #launchpad. | 03:51 |
| BasicOSX | BundleBuggy have troubles tonight? | 06:04 |
| Peng_ | BasicOSX: Seems that way. | 06:05 |
| BasicOSX | figures :-) | 06:05 |
| BasicOSX | http://downforeveryoneorjustme.com/bundlebuggy.aaronbentley.com | 06:07 |
| BasicOSX | Going to make confirming merge request for 1.14rc2 fun(?) | 06:09 |
| Peng_ | Nice. | 06:09 |
| BasicOSX | Need some assistance in where do I get a bug fix, when status = "Fix Committed" but no branch is associated with the bug. I'm looking to merge bug 355280 but don't know where the fix is located | 07:31 |
| ubottu | Launchpad bug 355280 in bzr "eol content filters are never loaded and thus never applied" [Critical,Fix committed] https://launchpad.net/bugs/355280 | 07:31 |
| === Kamping_Kaiser is now known as Bambi_BOFH | ||
| Stavros | hello | 16:48 |
| Stavros | i am trying to unshelve something and get "bzr: ERROR: The file id "magnifyingglass.png-20090417233633-s6z8t2odk0omj4yo-1" is not present in the tree <Inventory object at [...]" | 16:48 |
| Stavros | any idea what that's about? i really need my shelved changes back :/ | 16:49 |
| === serg_ is now known as serg | ||
| Stavros | anyone? | 16:56 |
| Stavros | does bzr just lose data like that? | 16:56 |
| Stavros | can anyone help me recover my lost data? | 17:11 |
| === _SamB_ is now known as SamB | ||
| SamB | Stavros: well, I'd save a copy of the directory before proceeding | 17:56 |
| Stavros | SamB: which directory do you mean? | 17:58 |
| SamB | Stavros: well, any relevant directories that have .bzr subdirectories | 18:07 |
| Stavros | i have nothing to proceed to, so not much danger there | 18:07 |
| Stavros | it just ate my work | 18:07 |
| === abentley1 is now known as abentley | ||
| Stavros | does anyone know how bzr works and what i can do about it? | 18:45 |
| cody-somerville | Stavros, what do you mean? :) | 18:48 |
| james_w | Stavros: that's odd, did you shelve the addition of a directory? | 18:48 |
| james_w | or any additions for that matter? | 18:48 |
| Stavros | james_w: i think it shelved a file, yes | 18:50 |
| james_w | ok | 18:50 |
| james_w | are there confidential things in this project? | 18:50 |
| Stavros | sadly, yes | 18:51 |
| Stavros | i don't need the file | 18:51 |
| Stavros | i need the other changes | 18:51 |
| Stavros | can i override a line of code? | 18:51 |
| james_w | if you look at .bzr/checkout/shelf/shelf-n | 18:51 |
| james_w | for the largest n in that dir | 18:51 |
| james_w | then you will see your changes | 18:51 |
| james_w | it would have been good if you could attach that to a bug report, but I guess you can't? | 18:52 |
| james_w | anyway, a bit of surgery should allow you to recover from that file | 18:52 |
| Stavros | i just made some changes (one of which was an added file), shelved them all, and committed a few revisions | 18:52 |
| Stavros | ah hmm, my changes are indeed there | 18:53 |
| Stavros | can i comment out the code that checks for files? | 18:54 |
| james_w | if it's hard to recover from that, then an alternative would be trying to come up with a way to reproduce in a new branch | 18:54 |
| Stavros | so bzr applies them? | 18:54 |
| james_w | then we can try and fix the bug | 18:54 |
| Stavros | how do you mean? | 18:54 |
| james_w | I doubt it's a simple as that | 18:54 |
| Stavros | hmm | 18:54 |
| james_w | cd /tmp; bzr init test | 18:54 |
| james_w | then try and do something similar with dummy files, and see if you can trigger the error | 18:54 |
| Stavros | hmm, let me check | 18:55 |
| Stavros | damn, i can't reproduce it | 18:57 |
| Stavros | nope, nothing | 18:58 |
| Stavros | is there a way for me to edit the pack file? | 18:59 |
| Stavros | oh damn, i actually do need the file in there | 18:59 |
| Stavros | oh, there it is | 19:00 |
| Stavros | i did a revert and now it breaks | 19:00 |
| james_w | the revert breaks? or the revert causes unshelve to break? | 19:01 |
| Stavros | the latter | 19:02 |
| james_w | so you have a minimal testcase? | 19:02 |
| Stavros | yes | 19:02 |
| james_w | cool, please open a bug and include it, and I'll take a look | 19:02 |
| Stavros | https://bugs.launchpad.net/bzr/+bug/363444 | 19:08 |
| ubottu | Ubuntu bug 363444 in bzr "unshelve crashes if there is a revert and file shelve." [Undecided,New] | 19:08 |
| Stavros | this should work | 19:08 |
| Stavros | can you take a look and tell me what's going on? i really need those changes :/ | 19:09 |
| Stavros | does it reproduce it for you? | 19:10 |
| james_w | Stavros: I was more looking for instructions | 19:13 |
| james_w | I'd like to know the steps that lead up to it, as well as see the final situation | 19:13 |
| Stavros | oh | 19:14 |
| Stavros | let me try again | 19:14 |
| Stavros | try now | 19:18 |
| Stavros | basically, shelve a file add and revert | 19:18 |
| Stavros | unshelve will fail | 19:19 |
| james_w | "bzr version"? | 19:19 |
| Stavros | 1.14rc1, but even trunk fails | 19:20 |
| james_w | nice, thanks | 19:21 |
| Stavros | np | 19:21 |
| Stavros | can you see what's wrong with it? | 19:21 |
| james_w | does it have to be two files shelved? | 19:21 |
| Stavros | james_w: i am not sure, i only tried with two actually | 19:21 |
| Stavros | it seems to work with one file | 19:22 |
| Stavros | yes, it only happens with two | 19:23 |
| james_w | three? | 19:23 |
| Stavros | shelvaw | 19:23 |
| Stavros | aw | 19:23 |
| Stavros | with three files, revert doesn't work | 19:24 |
| Stavros | it crashes | 19:24 |
| james_w | not for me | 19:24 |
| Stavros | actually | 19:24 |
| Stavros | bzr init, shelve a file add, revert, crash | 19:25 |
| james_w | that sounds like a separate bug, would you report that one too? | 19:25 |
| Stavros | sure | 19:26 |
| james_w | thanks | 19:26 |
| Stavros | any luck on the first bug? :/ | 19:26 |
| james_w | ok, so it requires two or more file adds shelved, and any sort of revert after crashes it | 19:26 |
| james_w | ah | 19:27 |
| Stavros | no, just the unshelve after the revert | 19:27 |
| james_w | doesn't even need a revert | 19:27 |
| Stavros | hmm | 19:27 |
| Stavros | it needed for me | 19:27 |
| james_w | #!/bin/bash | 19:28 |
| james_w | set -e | 19:28 |
| james_w | rm -rf test | 19:28 |
| james_w | bzr init test | 19:28 |
| james_w | (cd test && bzr ci -m "Commit." --unchanged && touch test2 test3 && bzr add && bzr shelve --all && bzr unshelve) | 19:29 |
| james_w | that's my minimal testcase | 19:29 |
| james_w | not doing the first commit seems to trigger another bug | 19:29 |
| Stavros | ah | 19:29 |
| Stavros | can you see why? | 19:30 |
| james_w | not yet | 19:30 |
| james_w | patience please | 19:30 |
| Stavros | okay | 19:30 |
| james_w | http://paste.ubuntu.com/153608/ | 19:32 |
| Stavros | hmm, what is that? | 19:32 |
| james_w | that's the difference between a one added file shelve and a two added file shelve | 19:33 |
| james_w | so it's clearly to do with that line | 19:33 |
| james_w | unfortunately I have no idea what that line means :-) | 19:33 |
| Stavros | haha | 19:33 |
| Stavros | so basically shelving two files crashes it? | 19:34 |
| james_w | looks like it | 19:34 |
| Stavros | do you think the shelf is corrupt? | 19:34 |
| james_w | _id_numberi3e18 | 19:34 |
| james_w | v.s. _id_numberi2e18 | 19:35 |
| james_w | then the extra new-239:test3-20090418182952-p5wbhmyzknaaa14q-2e9 | 19:35 |
| Stavros | it seems to be the same error as this https://bugs.launchpad.net/bzr/+bug/253806 | 19:36 |
| ubottu | Ubuntu bug 253806 in bzr "bzr: ERROR: The file id "foo-20080731224042-7ogu3b3hk0bwnpo3-1" is not present in the tree" [Medium,Fix released] | 19:36 |
| james_w | then something like new-15:test2 | 19:36 |
| james_w | nah, not really | 19:36 |
| Stavros | the same error message, i mean | 19:37 |
| james_w | what we're seeing is just a generic "foo is not in bar" error | 19:37 |
| james_w | ah, yeah, the cause is completely different I bet | 19:37 |
| Stavros | ah | 19:37 |
| Stavros | are you james westby? | 19:38 |
| james_w | yeah | 19:38 |
| Stavros | so you know about that bug | 19:38 |
| james_w | yup :-) | 19:38 |
| Stavros | hmm | 19:38 |
| Stavros | i have no idea what could be going on | 19:38 |
| Stavros | i'm not really familiar with the internals... | 19:38 |
| james_w | so we just seem to have some things repeated in the file, which would be expected | 19:38 |
| Stavros | what you pasted looks normal to me | 19:39 |
| Stavros | if it's saving the file IDs... | 19:39 |
| james_w | you can look at bzrlib/transform.py if you like | 19:39 |
| james_w | serialize and deserialize in there will help explain the format of that file | 19:39 |
| Stavros | ah | 19:40 |
| james_w | ok, so it's bencoded | 19:40 |
| Stavros | the error happens after the second deserialization | 19:41 |
| james_w | ok, adding debugging prints to serialize and deserialize helps us to see what is going on in there | 19:43 |
| james_w | http://paste.ubuntu.com/153611/ | 19:43 |
| Stavros | they look identical | 19:45 |
| james_w | oh, and running bzr with "-Derror" will get you a full traceback so you can see where it is failing | 19:45 |
| james_w | yeah, I wouldn't expect that the serialization itself was the problem | 19:46 |
| james_w | it's writing out bad data | 19:46 |
| Stavros | so it tries to merge and doesn't find a file id to merge with? | 19:46 |
| james_w | an unshelve operation is a merge | 19:48 |
| Stavros | does it store a pack and then merge it? | 19:48 |
| james_w | it stores a serialized TreeTransform, which is something internally used in merge | 19:49 |
| james_w | and then tries to apply it by doing a merge | 19:49 |
| Stavros | right right | 19:49 |
| james_w | it applies the transform on the old tree (hence saving the revision id) to get a new tree, and then merges that new tree with your working tree | 19:49 |
| Stavros | ah | 19:50 |
| Stavros | which stage do you think is failing? | 19:50 |
| james_w | but it shouldn't be asking the working tree for the kind of these files, as they aren't in the working tree | 19:50 |
| Stavros | true | 19:50 |
| james_w | well it's crashing in the last stage, but I don't know what's at fault | 19:50 |
| Stavros | hmm | 19:50 |
| Stavros | there aren't many things that would cause it to crash with two files and not with two, i assume... | 19:53 |
| Stavros | err, one | 19:53 |
| james_w | no | 19:53 |
| Stavros | oops | 19:55 |
| Stavros | test | 19:55 |
| Stavros | hmm | 19:55 |
| Stavros | i should redo my changes, i guess... | 19:55 |
| zanaga | is there an easy way of getting bzr in to a postmortem debug? | 19:57 |
| LarstiQ | zanaga: depending on what you mean with that, if you `BZR_PDB=1 bzr <command>` it will drop into pdb on error | 19:58 |
| zanaga | that's exactly what i want =) | 19:58 |
| zanaga | thanks | 19:58 |
| LarstiQ | ^\ is also useful to break into pdb | 19:59 |
| Stavros | damn, so much work lost... | 20:02 |
| LarstiQ | Stavros: you should be able to salvage them from the shelf | 20:03 |
| Stavros | LarstiQ: there's a png in there i don't know how to get :/ | 20:03 |
| LarstiQ | Stavros: in a test with adding a png and then shelving, editing the shelf-1 file gives me back my png | 20:07 |
| Stavros | LarstiQ: how did you edit it? | 20:07 |
| Stavros | i managed to get the other changes | 20:08 |
| LarstiQ | Stavros: just a sec | 20:08 |
| LarstiQ | Stavros: it looks roughly like http://rafb.net/p/HaZbYo46.html | 20:10 |
| Stavros | yes | 20:10 |
| Stavros | but won't editing it discard the binary data? | 20:10 |
| LarstiQ | Stavros: I deleted everything up to and including the 'i 10\n' line | 20:10 |
| Stavros | actually let me open it with a hex editor | 20:10 |
| LarstiQ | Stavros: then I deleted everything from and including the 'E' at the end | 20:11 |
| LarstiQ | Stavros: I edited it with vim | 20:11 |
| Stavros | oh good | 20:11 |
| Stavros | let me do that then | 20:11 |
| LarstiQ | Stavros: and then used hexedit to remove the final newline | 20:11 |
| LarstiQ | after that, cmp between shelf-1 and the original png I copied reported no differences | 20:11 |
| Stavros | interesting, that looks lke it worked | 20:12 |
| Stavros | i'll reexport in photoshop to make sure | 20:12 |
| Stavros | thank you for your help | 20:12 |
| LarstiQ | Stavros: np, I hope you got all your data out correctly. | 20:13 |
| LarstiQ | Stavros: and thanks for reporting the bug, shelve needs some bugsquashing | 20:13 |
| Stavros | looks like it :/ | 20:13 |
| Stavros | most of the data was text so i got it out, looks like this png was the last | 20:13 |
| Stavros | it seems to work fine now, thank you very much! | 20:14 |
| Stavros | should i delete the shelf file? | 20:15 |
| LarstiQ | Stavros: I'm not entirely sure how that works | 20:16 |
| LarstiQ | Stavros: but shelve --destroy should work | 20:16 |
| Stavros | ah, thanks | 20:16 |
| Stavros | that tried to shelve changes again | 20:16 |
| Stavros | actually that selectively reverts changs | 20:16 |
| LarstiQ | Stavros: hokay | 20:18 |
| LarstiQ | evening lamont | 20:18 |
| BasicPRO | boo on thunderstorms | 20:22 |
| james_w | wow | 20:27 |
| james_w | it does seem to be lost in the serialization | 20:27 |
| james_w | two files are recorded, but only one comes back out it seems | 20:27 |
| Stavros | that's interesting | 20:28 |
| james_w | and when you do it with three, still only the first one comes back out | 20:29 |
| Stavros | hmm | 20:29 |
| james_w | but I must go eat | 20:33 |
| james_w | Stavros: I assume this isn't urgent anymore, you have recovered the things you needed to? | 20:33 |
| Stavros | james_w: indeed i have, thank you | 20:33 |
| james_w | excellent | 20:33 |
| === BasicPRO is now known as BasicOSX | ||
| Peng_ | lifeless: ping | 21:29 |
| === weltende is now known as welterde | ||
| james_w | ah, it's multiple empty files that mess it up | 23:03 |
| james_w | when you serialize an empty file addition you get no body, so the reader gets thrown off | 23:03 |
| lifeless | pasky: ? | 23:10 |
| lifeless | bah sorry pasky , tab completion fail | 23:11 |
| lifeless | Peng_: ? | 23:11 |
| Peng_ | lifeless: Oh hi. Um. Do you have access to the queue of messages being held for approval by the mailing list software? I think one I sent might be being held. | 23:19 |
| lifeless | for the main list? yes, though right now I can't surf | 23:20 |
| lifeless | small matter of only irc working because its not actually on my machine :) | 23:20 |
| lifeless | everything else is thrashing insanely | 23:21 |
| Peng_ | Oh. | 23:21 |
| Peng_ | Why? | 23:21 |
| lifeless | writing a full scale test index | 23:22 |
| Peng_ | Oh. | 23:22 |
| lifeless | to get a perf trace on index writing | 23:22 |
| lifeless | and its uhm, well | 23:22 |
| Peng_ | I wanted to check the mailing list archive again before asking you about this, but Firefox crashed as I was writing. :D | 23:22 |
| lifeless | I have 2G of memory | 23:22 |
| lifeless | its vss is3G | 23:22 |
| Peng_ | Ouch. | 23:22 |
| Peng_ | Boy, I remember the days when I thought getting 1 GB of RAM felt a little excessive. | 23:23 |
| lifeless | 'room for optimisation' | 23:23 |
| lifeless | Peng_: the index have > 8000000 keys | 23:53 |
Generated by irclog2html.py 2.7 by Marius Gedminas - find it at mg.pov.lt!