| ronny | to the logs: ignore the lie above :P | 00:00 |
|---|---|---|
| Kilroo | I hope Eclipse fixes whatever bug bzr 2.1.0b4 causes bzr-eclipse to expose in Helios. | 00:00 |
| Kilroo | Assuming that the guy who responded to my question about it by saying it's an eclipse bug is right. | 00:00 |
| Kilroo | I need to capture some logs and figure out how to report it. And where. | 00:00 |
| EdWyse_Office | if I didn't know what I was doing and "mv /foo1/branch /foo2/branch" and now it says, 'bzr: ERROR: No repository present: "file:///foo2/branch"', how do I fix that? | 01:02 |
| Kilroo | How much else have you done since? | 01:03 |
| EdWyse_Office | That's it. | 01:03 |
| === mwhudson_ is now known as mwhudson | ||
| EdWyse_Office | I just needed to get the branch off that nfs mount. | 01:04 |
| Kilroo | Would "mv /foo2/branch /foo1/branch & bzr mv /foo1/branch /foo2/branch" work then? | 01:05 |
| Kilroo | Oh wait. | 01:05 |
| Kilroo | Don't you need a repo on top of it? | 01:05 |
| EdWyse_Office | Oh! Right! I forgot I made /foo1 a repo! | 01:05 |
| EdWyse_Office | Thanks. | 01:05 |
| Kilroo | I mostly mess around with shared repositories so far so sometimes the other way of doing it muddles me | 01:06 |
| Kilroo | Given the use case you're talking about, would bzr branch /foo1/branch /foo2/branch be preferable, though? | 01:06 |
| Kilroo | I'm a noob, so if it wouldn't, I just don't understand why yet. | 01:07 |
| * igc food | 01:16 | |
| lifeless | EdWyse_Office: move it back, then do 'bzr branch /foo1/branch /foo2/branch | 01:50 |
| === abentley1 is now known as abentley | ||
| === mordred_ is now known as mtaylor | ||
| === abentley1 is now known as abentley | ||
| === mwhudson_ is now known as mwhudson | ||
| jfroy | Glenjamin: hey | 03:42 |
| === sdboyer_ is now known as sdboyer | ||
| chromakode | is it possible to change committer names/emails on old commits? | 04:09 |
| Peng | chromakode: No. | 04:10 |
| Peng | Well. | 04:10 |
| chromakode | I'm aware of some voodoo to do it in git | 04:11 |
| chromakode | was wondering if there's an equivalent in bzr-land | 04:11 |
| Peng | chromakode: bzr-fastimport can do it -- quite easily, too -- but you'd wind up with new revision IDs, so unless you put the nuclear launch codes in your email address, it's usually not worth it. | 04:11 |
| chromakode | right, yep | 04:11 |
| chromakode | I understand that issue | 04:11 |
| chromakode | not worth it :) | 04:11 |
| chromakode | is doing this technically impossible with bzr (does it mess up hashes?) | 04:12 |
| Peng | Like I said, you can do it with bzr-fastimport. | 04:13 |
| Peng | I dunno if it changes the hashes. | 04:13 |
| chromakode | understood. please excuse my ignorance of bzr internals, but is the committer info hashed? | 04:14 |
| chromakode | okay | 04:14 |
| Peng | Still, bzr is not designed to go changin' stuff. :P | 04:14 |
| chromakode | thanks, just a matter of curiosity! | 04:14 |
| Peng | :) | 04:14 |
| chromakode | altering history never works out | 04:14 |
| chromakode | I learned that watching 90s cartoons | 04:14 |
| Peng | You can find a few "@mylaptop" commits in the history of Bazaar itself. :D | 04:14 |
| chromakode | haha | 04:15 |
| chromakode | it's hard for me to let go of the ideal commit log | 04:15 |
| mwhudson | bzr also has a commit with revid 'A' in it's history :-) | 04:17 |
| mwhudson | -' grrr | 04:17 |
| chromakode | huh! what happened there? | 04:17 |
| Peng | The hypothesis I've heard is that a unit test accidentally committed to the real history, and the developer apparently didn't catch it in time. | 04:19 |
| chromakode | ha! | 04:20 |
| Peng | The commit message is "silly commit" and it adds a file called "b". :D | 04:21 |
| chromakode | that's a wonderful piece of trivia | 04:22 |
| lifeless | it is a unit test | 04:23 |
| lifeless | its still in the tree | 04:23 |
| SamB_XP_ | but it somehow went awry? | 04:23 |
| lifeless | early unit tests weren't as isolated | 04:24 |
| chromakode | haha. | 04:25 |
| chromakode | someone clearly ran a unit test on their dev tree | 04:25 |
| lifeless | how else would you test? | 04:25 |
| chromakode | ;) | 04:25 |
| Peng | That revision also suffers from the "@mylaptop" committer ID problem. :D | 04:27 |
| chromakode | hmm | 04:28 |
| chromakode | maybe that could be avoided if there was an "Are you sure?" prompt if you try to commit with an unset email/username | 04:28 |
| lifeless | chromakode: no, because the test suite runs with a null UI | 04:29 |
| lifeless | chromakode: the /commit/ is what the test suite wanted | 04:29 |
| chromakode | I realize that won't help for the test suite | 04:29 |
| chromakode | but it might help me from being stupid when I'm branching on a laptop | 04:29 |
| lifeless | if you're interested, its revno: 0.2.1 | 04:29 |
| chromakode | the tree is still downloading :/ | 04:30 |
| Peng | You can also do "bzr log -r revid:A". | 04:30 |
| chromakode | is there any reason bzr requires the -r argument? | 04:30 |
| lifeless | Peng: the machine name is valid btw, not really a problem :P | 04:30 |
| lifeless | chromakode: because bzr log FOO logs the branch FOO | 04:30 |
| Peng | Or the file FOO. | 04:31 |
| chromakode | is it ambiguous if there's a colon in there and no file? | 04:31 |
| Peng | http://bazaar.launchpad.net/~bzr-pqm/bzr/bzr.dev/revision/0.2.1 :D | 04:31 |
| lifeless | its easier to tell people 'to control the revision use -r' | 04:31 |
| chromakode | sorry if this is annoying, I've just always been curious about these things | 04:31 |
| lifeless | than to say 'if you pass a revision that is not a branch or a file it will work, and when you want a branch or file *and* a revision use -r' | 04:32 |
| chromakode | ah, good point | 04:32 |
| chromakode | it's just kind of odd to me when I only want a rev, not a file | 04:32 |
| Peng | It's more consistent with other commands, too. | 04:33 |
| chromakode | yeah, it's definitely more consistent | 04:34 |
| Peng | For example, "bzr branch -r 123 some_location" | 04:34 |
| Peng | chromakode: It's not annoying. :) Besides, I've asked lifeless far more weird questions than you have. :P | 04:35 |
| chromakode | yes, I should just develop the semantic association that -r is always revision | 04:35 |
| chromakode | okay, I have one more question, regarding workflow | 04:35 |
| chromakode | do you create lots of new branches when you need to work in multiple directions at one? do you branch when you're fixing a bug? how do you manage the directory structure of your branches? | 04:36 |
| chromakode | or do bzr users tend to shelve and unshelve more? | 04:36 |
| Peng | I just create lots of branches. | 04:37 |
| chromakode | I realize they're separate commands with different purposes, but I wonder what the dominant context-switch approach is | 04:37 |
| Peng | Some people create multiple branches but just use one working tree, "bzr switch"ing to the branch they want. | 04:38 |
| chromakode | Peng: how do you structure your directories? a bunch of branches inside a repo? | 04:38 |
| Peng | I think there are some plugins for making this easier. | 04:38 |
| Peng | chromakode: Yeah. | 04:38 |
| chromakode | ah, is bzr switch relatively new? | 04:38 |
| Peng | No. | 04:38 |
| chromakode | okay. I thought I'd read about it somewhere | 04:38 |
| Peng | chromakode: I know one of Bazaar's developers creates a subdirectory for each version. I don't, but I don't create a lot of branches either. :P | 04:39 |
| chromakode | cool. thanks for answering my questions :) | 04:41 |
| Peng | :) | 04:42 |
| wolter | does bash use bash programmable completion? | 06:50 |
| wolter | bzr | 06:50 |
| wolter | * | 06:50 |
| Kamping_Kaiser | does for me, i'm guessing most packages of it would | 06:53 |
| Kamping_Kaiser | at leats, if i understand correctly ;) | 06:53 |
| wolter | yeah, but i mean does it do it through bash? I don't see nothing about bzr in /etc/bash_completion | 06:54 |
| Kamping_Kaiser | i have /etc/bash_completion.d/bzr{,.simple} | 06:54 |
| wolter | oh | 06:56 |
| wolter | nice | 06:56 |
| wolter | i didn't know about that dir, but its awesome that exists | 06:56 |
| chromakode | yeah! | 06:57 |
| Kamping_Kaiser | :) | 07:00 |
| vila | hi all | 07:21 |
| EdWyse_Mobile | When I decided to add our pdfs and graphics for our web site to the local branch, then push to the remote repo (a little over a gig) using the windows gui, it gets to "fetching revisions:inserting stream", the status bar at 50%, and stops. 20 minutes and counting so far. Is that expected behavior? | 08:13 |
| === gerard_1 is now known as gerard_ | ||
| * igc dinner | 08:23 | |
| gerard_ | hey all | 08:27 |
| Glenjamin | jfroy: still around? i've installed keychain but i just get the command line prompt when i try and access a protected branch | 08:34 |
| Raim | Glenjamin: did you add the relevant key to ssh-agent? (either with ssh-add or keychain) | 09:06 |
| Glenjamin | it's a username/password auth which i'm trying to get handled by bzr-keychain on mac os x | 09:06 |
| Raim | ah, sorry. just made a guess :) | 09:07 |
| === mgolisch_ is now known as mgolisch | ||
| starenka_ | can sbdy tell me how to run bzr serve via ssh? i tried bzr serve --allow-writes --inet --protocol=ssh, but no avail. there'sno help about the protocols :( | 11:01 |
| === LenZGr_ is now known as LenZGr | ||
| === LenZGr is now known as LenZ | ||
| === LenZ is now known as LenZG | ||
| === LenZG is now known as LenZGr_ | ||
| * GaryvdM waves at bialix | 11:22 | |
| bialix | heya Gary! | 11:22 |
| * bialix waves back :-D | 11:22 | |
| === LenZGr_ is now known as LenZ | ||
| bialix | GaryvdM: what you think about pyqt 4.7? | 11:52 |
| GaryvdM | bialix: I have not installed it, so I don't really know. It's good though that they have installers for more versions of python. | 11:55 |
| bialix | yes | 11:55 |
| bialix | I fear that will continue to ignore 2.5, but apparently it's not | 11:56 |
| GaryvdM | I think for the windows installers, we should upgrade only early in the next cycle. | 11:57 |
| GaryvdM | not now, which is what i think jam is going to do. | 11:58 |
| GaryvdM | I'm installing bzr onto a clients mac atm. | 11:59 |
| GaryvdM | And it is working :-) | 12:02 |
| bialix | cool! | 12:02 |
| GaryvdM | bialix: It's not that hard. Did you know that we have an installer that includes pyqt (but not qt.) I did not. | 12:07 |
| bialix | for Mac? | 12:07 |
| GaryvdM | Yip | 12:07 |
| bialix | there is some advice on bazaar.canonical.com/QBzr | 12:08 |
| GaryvdM | http://wiki.bazaar.canonical.com/MacOSXDownloads | 12:08 |
| * bialix has no mac to play with, alas | 12:08 | |
| bialix | that's really cool | 12:09 |
| bialix | GaryvdM: should we update our page then? http://wiki.bazaar.canonical.com/QBzr ? | 12:09 |
| bialix | it said: NOTE: OSX users will also need to install PyQt. Instructions are available from Installation of PyQt on Mac OS X. | 12:09 |
| GaryvdM | Yes, we can just point them to http://wiki.bazaar.canonical.com/MacOSXDownloads | 12:11 |
| bialix | I trust your experience :-) | 12:12 |
| GaryvdM | I'm trying to use the bzr packaging scripts to update the qbzr ppa for the first time. | 12:43 |
| GaryvdM | I'm getting an error with update-changelogs.sh | 12:43 |
| GaryvdM | see http://paste.ubuntu.com/360630/ | 12:43 |
| * bialix waiting for jam and 2.1.0rc1 bzr.exe installer | 12:43 | |
| bialix | GaryvdM: maybe it searching case-insensitive? | 12:46 |
| bialix | err, sensitive I mean | 12:46 |
| bialix | strange | 12:48 |
| bialix | really | 12:48 |
| GaryvdM | dch can't find changelog when run from the script, but if I run dch manually, it works? | 12:51 |
| GaryvdM | Hmm - I removed the "-c changelog" from line 30 of update-changelogs.sh. Not sure how it works normally | 13:01 |
| GaryvdM | I don't think so, maybe the bzr packaging branches have a different layout. | 13:06 |
| GaryvdM | ah, that is the case. | 13:07 |
| jam | bialix: I'm waiting for information about how to get tbzr 0.5.0 built | 14:39 |
| jam | naoki added i18n, but I don't have the .mo files he wanted bundled | 14:39 |
| bialix | hi jam | 14:39 |
| bialix | ok | 14:39 |
| GaryvdM | Hi jam | 14:39 |
| jam | I haven't gotten a response from him, so I don't really know | 14:39 |
| jam | hi GaryvdM | 14:40 |
| jam | morning all | 14:40 |
| vila | morning jam | 14:40 |
| GaryvdM | jam: For qbzr, we have to do >python setup.py build_mo -f | 14:42 |
| GaryvdM | maybe it is the sameqQ | 14:42 |
| GaryvdM | ? | 14:42 |
| jam | GaryvdM: could be. I do see a build_mo in setup.py | 14:44 |
| jam | He didn't add any such step to the release process when he updated the installers | 14:44 |
| jam | but I bet he wasn't sure how the process went, and probably had already done certain steps manually | 14:44 |
| * bialix looks | 14:46 | |
| GaryvdM | bialix: I'm thinking we should do our releases as follows: 0.19b1 0.19b2 ... 0.19bn 0.19rc1* 0.19rc2 0.19.0 0.19.1 | 14:49 |
| GaryvdM | Like bzr core. | 14:49 |
| bialix | to be in sync with bzr? | 14:49 |
| bialix | this is for 2.2? | 14:50 |
| GaryvdM | Yes | 14:50 |
| bialix | interesting idea | 14:50 |
| bialix | why not | 14:50 |
| bialix | jam should be happy | 14:50 |
| GaryvdM | The betas don't have to be in sync, but the rest should. | 14:51 |
| jam | GaryvdM: you can certainly do that, but are you sure you're going to release in sync? Especially for stable releases... | 14:52 |
| bialix | jam: tbzr uses the same code as qbzr for i18n | 14:52 |
| bialix | jam: python setup.py build_mo actually builds mo | 14:53 |
| bialix | they are in locale | 14:53 |
| bialix | can I help you with installer? | 14:53 |
| GaryvdM | jam: True, we would probably have less stable releases than bzr. | 14:53 |
| bialix | rats, naoki pushed loom branch to lp | 14:55 |
| bialix | bzr produce not very nice error for this | 14:56 |
| bialix | !pastebin | 14:56 |
| ubottu | For posting multi-line texts into the channel, please use http://ubuntu.pastebin.com | To post !screenshots use http://tinyurl.com/imagebin | !pastebinit to paste directly from command line | Make sure you give us the URL for your paste - see also the channel topic | 14:56 |
| bialix | http://ubuntu.pastebin.com/m5c1d1aca | 14:57 |
| jam | bialix: If you want. For now I have to update the build process to add "build_mo" into the tbzr build steps | 14:57 |
| jam | and currently that is blocked on getting "msgfmt" installed | 14:57 |
| jam | which is blocked on cygwin upgrading from 1.5 to 1.7... | 14:57 |
| bialix | jam: how you're handle qbzr then? | 14:57 |
| bialix | it uses the same stuff | 14:58 |
| jam | bialix: you version qbzr | 14:58 |
| jam | qbzr's .mo | 14:58 |
| bialix | and explorer too | 14:58 |
| bialix | no | 14:58 |
| jam | I believe | 14:58 |
| bialix | we don't version mo | 14:58 |
| jam | *shrug* the build works | 14:58 |
| jam | running build_mo manually says 'no msgfmt' fonud | 14:58 |
| jam | fonud | 14:58 |
| jam | found | 14:58 |
| bialix | they are present in tar.gz | 14:58 |
| jam | and I don't see it on my system | 14:58 |
| bialix | no, sorry | 14:58 |
| bialix | mo is purely build time files | 14:59 |
| bialix | can you install them for windows not cygwin? | 14:59 |
| bialix | running build_mo manually -- maybe something wrong with your path? | 15:00 |
| jam | bialix: it is possible, running 'c:\Python25\python setup.py build_mo' doesn't work in tbzr or qbzr | 15:03 |
| jam | are you sure the .mo files are in the installers? | 15:03 |
| bialix | I can test you 2.0.4 if you want | 15:03 |
| bialix | but naoki patch for installers is wrong re iss.cog | 15:04 |
| bialix | he's added line: ; cog.outl('Source: "%s\\locale\\*.mo"; DestDir: "{app}\\doc\\tbzr"; Flags: createallsubdirs ignoreversion recursesubdirs; Components: tortoise' % os.environ['TBZR']) | 15:04 |
| jam | I see the .mo files for one of the older builds | 15:04 |
| bialix | should be: | 15:04 |
| jam | (2.0.3 here) | 15:04 |
| bialix | oops | 15:04 |
| bialix | jam: for c:\Python25\python setup.py build_mo' you need not cygwin msgfmt. you can install gettext from gnuwin32.sf.net | 15:05 |
| jam | bialix: I *can* but I don't want to do my own dependency tracking if I can avoid it | 15:06 |
| jam | setting up a build host is already a huge pain | 15:07 |
| bialix | I have some free time today | 15:08 |
| bialix | I can help | 15:08 |
| jam | I needed to install gettext-devel | 15:10 |
| jam | and msgfmt is found | 15:10 |
| jam | oddly, I don't know how the .mo files would be in 2.0.3... | 15:10 |
| jam | running python setup.py build will happily skip creating .mo files | 15:10 |
| jam | it issues a warning to the terminal, but doesn't stop the build process | 15:10 |
| jam | might want to look closer at that | 15:10 |
| === CardinalXiminez_ is now known as CardinalFang | ||
| bialix | jam: it seems absent msgfmt was the main reason | 15:15 |
| bialix | because you only need setup.py build to build both mo and other tbzr stuff | 15:16 |
| bialix | there is used such trick as: build.sub_commands.insert(0, ('build_mo', None)) | 15:16 |
| jam | bialix: missing msgfmt, but I didn't notice because when build_mo failed it didn't stop the build | 15:17 |
| bialix | it may be my fault | 15:18 |
| bialix | I did not return anything from build mo | 15:18 |
| jam | however, what is your thoughts on the changes to the iss script? | 15:18 |
| bialix | they seems a bit wrong | 15:18 |
| bialix | based on the code in tbzrlib/i18n.py it should be locale dir right along bzr.exe | 15:19 |
| bialix | jam: I think that line should be ; cog.outl('Source: "%s\\locale\\*.mo"; DestDir: "{app}\\locale"; Flags: createallsubdirs ignoreversion recursesubdirs; Components: tortoise' % os.environ['TBZR']) | 15:22 |
| bialix | ; cog.outl('Source: "%s\\locale\\*.mo"; DestDir: "{app}\\locale"; Flags: createallsubdirs ignoreversion recursesubdirs; Components: tortoise' % os.environ['TBZR']) | 15:22 |
| bialix | jam: do you see where to add that line? | 15:24 |
| jam | I understand where that would go | 15:24 |
| jam | I'd just like confirmation that it does the right thing | 15:24 |
| jam | bialix: so I can confirm that 2.0.4-1 does *not* have the .mo files | 15:25 |
| bialix | jam: based on the code in tbzr: | 15:26 |
| bialix | def _get_locale_dir(): | 15:26 |
| bialix | if hasattr(sys, 'frozen'): | 15:26 |
| bialix | base = os.path.dirname(unicode(sys.executable, sys.getfilesystemencoding())) | 15:26 |
| bialix | return os.path.join(base, u'locale') | 15:26 |
| bialix | sys.executable is the bzr.exe path? I guess | 15:27 |
| bialix | or other tbzr exe binary | 15:27 |
| bialix | jam: do you remember how to get exit code of other program in windows shell? | 15:28 |
| bialix | found | 15:29 |
| jam | %ERRORCODE% or %ERRORLEVEL% ? | 15:30 |
| bialix | jam: about build_mo exit code: that's seems intended behavior: http://ubuntu.pastebin.com/d137823cd | 15:30 |
| bialix | I can change this if you think it's desirable | 15:30 |
| bialix | do you think? | 15:31 |
| jam | bialix: so doing that means that when I don't have msgfmt installed it fails to build but doesn't stop the build process | 15:31 |
| bialix | or I can produce error if --force flag is used... | 15:31 |
| jam | I would think that you would want to fail if you can't build the i18n files | 15:32 |
| jam | at least for building the official installers | 15:32 |
| bialix | yes, for official installer it makes many sense | 15:32 |
| bialix | I can change this for qbzr | 15:32 |
| jam | I'm not a big fan of building the installer and having users tell me it is broken | 15:32 |
| jam | though it seems to happen often enough | 15:32 |
| bialix | why for users then? ;-) | 15:33 |
| jam | well, I wouldn't care except they expect me to do something about it | 15:33 |
| bialix | :-) | 15:34 |
| jam | and spending an hour building yet-another installer isn't my ideal time sink | 15:34 |
| bialix | except - expect. nice | 15:34 |
| bialix | like a palindromne | 15:35 |
| bialix | jam: my guess about iss.cog was correct | 15:40 |
| jam | yeah, looks like | 15:40 |
| bialix | based on naoki answer | 15:41 |
| jam | ok, the build at least succeeds this time | 15:44 |
| bialix | great | 15:44 |
| jam | now to sort out the installed location issues | 15:44 |
| bialix | at least we found problem with build_mo | 15:44 |
| bialix | I will update the builders for qbzr, explorer and MP for tbzr | 15:44 |
| smartgpx | Greetings. I have a query about 'bzr revert' not acting as I expected. | 15:52 |
| smartgpx | I thought in general terms it aligned the files in a WT to correspond to the state of the tip revision. | 15:53 |
| smartgpx | but that's not happening. | 15:53 |
| smartgpx | Tried with 2.1.0b4 on WinXP and 2.1.0b1 on linux with same result | 15:54 |
| bialix | smartgpx: it does | 16:05 |
| smartgpx | bialix: not for me. but maybe I am misunderstanding. can I email you a noddy script to look at? | 16:07 |
| bialix | you can pastebin it | 16:07 |
| bialix | or email | 16:07 |
| GaryvdM | smartgpx: it brings it to the state of the branches tip | 16:07 |
| GaryvdM | smartgpx: not the bound branch | 16:08 |
| GaryvdM | *not the bound branch's tip | 16:09 |
| smartgpx | does 'inventory' report on the branches tip? [this is simple personal stuff, no bound branches involved.] | 16:09 |
| BusMaster | I wish to get a branch from several commits ago. How should i do that? | 16:11 |
| GaryvdM | smartgpx: no - bzr inventory --help -> Purpose: Show inventory of the *current working copy* or a revision. | 16:12 |
| GaryvdM | for branch tip: bzr inventory -r -1 | 16:12 |
| vila | BusMaster: bzr branch -r -4 ../new-branch | 16:13 |
| vila | err | 16:13 |
| vila | BusMaster: bzr branch -r -4 old-branch new-branch | 16:13 |
| BusMaster | vila, old-branch can be something like lp:~sagar/+junk/sarathi ? | 16:14 |
| BusMaster | vila, or is that the repository ? | 16:15 |
| vila | BusMaster: sure, can be any valid branch URL | 16:15 |
| bialix | heya vila! | 16:15 |
| BusMaster | vila, ok thanks | 16:15 |
| vila | hey bialix ! | 16:15 |
| smartgpx | regarding revert - see http://pastebin.com/d5b917d0c | 16:23 |
| smartgpx | I expected to get back to a working directory with only the one committed file in it. | 16:23 |
| * GaryvdM looks | 16:26 | |
| vila | smartgpx: there is no changes so revert is a no-op | 16:27 |
| GaryvdM | smartgpx: bzr does not touch unversioned files | 16:28 |
| vila | yeah, no changes on versioned files | 16:28 |
| GaryvdM | If you did bzr add, and then bzr revert, "two" would be deleted. | 16:29 |
| GaryvdM | You may find clean-tree helpfull here | 16:29 |
| smartgpx | add and revert not sucessful - http://pastebin.com/d79a6bb18 | 16:32 |
| GaryvdM | sorry - I guess I was wrong about that then. | 16:33 |
| smartgpx | bzr help revert says "Any files that have been newly added since that revision will be deleted" so it doesn't seem to be working right? | 16:36 |
| smartgpx | This makes providing a 'clean' reply to ANSWER:98183 a bit complicated? | 16:38 |
| smartgpx | No, actually it doesn't if you are prepared to Branch from an old revision rather than 'winding back' the tree you currently have. | 16:40 |
| === beuno is now known as beuno-lunch | ||
| jam | vila: are you still around? | 16:53 |
| jam | I was wondering if you've seen http://code.google.com/p/python-ntlm/ | 16:53 |
| jam | for handling NTLM auth proxies for bzr | 16:54 |
| vila | jam: hmm, interesting | 16:57 |
| jam | in the short term, there also seems to be: http://sourceforge.net/projects/ntlmaps/ | 16:57 |
| vila | jam: if it's done as AuthHandler as it seems, it may be easy to integrate | 16:57 |
| jam | which seems to run a local app | 16:57 |
| jam | that you proxy through, which then proxies via NTLM for you | 16:57 |
| jam | hard for *me* to test, as I don't have an NTLM proxy :) | 16:58 |
| vila | jam: but keep in mind that most NTLM proxies also accept Basic so we have yet to find people really blocked by the lack of NTLM support | 16:58 |
| jam | and I'm guessing neither do you | 16:58 |
| vila | jam: you guess right :-/ | 16:58 |
| jam | well, bug 363019 is blocking someone... | 16:58 |
| ubottu | Launchpad bug 363019 in bzr "bzr fails to do proxy authentication" [Low,Confirmed] https://launchpad.net/bugs/363019 | 16:58 |
| jam | as is bug 244879 | 16:59 |
| ubottu | Launchpad bug 244879 in bzr "http urllib implementation doesn't support NTLM auth scheme" [Medium,Confirmed] https://launchpad.net/bugs/244879 | 16:59 |
| jam | at least gareth white claims so | 16:59 |
| jam | he says he used a different intermediate proxy for it | 16:59 |
| vila | jam: I *am* looking at it, but it seems the problem in 363019 is that we can't even ping code.lp.net | 16:59 |
| vila | Gareth found a workaround so he isn't blocked :D | 17:00 |
| jam | vila: so for 363019 the don't even know if there is a route to c.lp.net? | 17:01 |
| jam | couldn't they use a browseR? | 17:01 |
| vila | jam: I asked if he can ping | 17:02 |
| jam | vila: looking at the last traceback:ConnectionError: Connection error: Couldn't resolve host 'code.launchpad.net' (11001, 'getaddrinfo failed') | 17:02 |
| jam | doesn't look like it has anything to do with proxies | 17:02 |
| jam | unless they are proxying DNS requests... | 17:02 |
| vila | I seem to remember David Cornoupeau talking about a config where the DNS was proxied, but I didn't make sense (to me) at the time | 17:02 |
| jam | I've heard of using DNS as a secret proxy | 17:03 |
| jam | you make request for certain 'well-formed' IP addresses, and it proxies the actual http responses, etc. | 17:03 |
| jam | http://thomer.com/howtos/nstx.html | 17:04 |
| jam | wow. even has "IP-over-ICMP" | 17:05 |
| jam | so you use ping packets to get your data... | 17:05 |
| vila | jam: I don't want to hear more about that :D | 17:08 |
| vila | jam: hmm, looking at http://code.google.com/p/python-ntlm/, it's doing far too much to be re-used directly (at least the handler part), | 17:10 |
| vila | http://code.google.com/p/python-ntlm/source/browse/trunk/python26/ntlm/ntlm.py seems to be the needed part, but it makes my eyes bleed :-/ | 17:11 |
| jam | vila: it doesn't seem that bad, just foolish | 17:14 |
| jam | rather than using code comments | 17:14 |
| jam | they use variables | 17:14 |
| jam | like calling struct.pack 20 times | 17:14 |
| vila | and assert | 17:14 |
| jam | rather than 1 pack with 20 args | 17:14 |
| vila | jam: I didn't say bad :) | 17:15 |
| vila | Or I would have said: it makes my *heart* bleed :) | 17:15 |
| jam | I think it is ~ reasonable when you are debugging, but for an actual implementation, it seems it could be made a lot better | 17:15 |
| vila | +1 | 17:15 |
| vila | jam: and no tests :-{ | 17:19 |
| jam | in this case, running against a real server is probably the best test | 17:19 |
| vila | s/best/first/ | 17:19 |
| vila | :D | 17:20 |
| vila | jam: anyway, thanks for the pointer, that can at least be a starting poijnt | 17:20 |
| jam | vila: no, *best* test (most authoritative) | 17:21 |
| vila | jam: no, *first* test, *one* server, we're talking MSoft here, do you really think a single server will be enough ? | 17:22 |
| jam | vila: it is enough if you're the guy stuck behind that particular proxy :) | 17:23 |
| vila | yeah, but I'm the guy maintaining the code ;D | 17:23 |
| bialix | jam: can I download new installer, or you're not finished it? | 17:27 |
| jam | bialix: I'm rebuilding 2.0 right now, and I'll be doing 2.1 next | 17:28 |
| bialix | ah, ok | 17:28 |
| bialix | so, I'll check tomorrow | 17:28 |
| * bialix waves bye | 17:29 | |
| Ddorda | hey. Im trying to make a new branch, done init and add, but when I push it says I don't have permissions for some reasons :S | 17:37 |
| Ddorda | what might be the problem? | 17:37 |
| jam | \o/ my passport just arrived | 17:46 |
| vila | YES | 17:47 |
| vila | pfew | 17:47 |
| jam | igc: what are you doing awake... :) | 17:48 |
| === beuno-lunch is now known as beuno | ||
| vila | jam: we use KnownGraph to caluclate revnos for pack-0.92 too right ? | 18:10 |
| jam | vila: yeah, I don't think reading from the index is fast-pathed | 18:23 |
| jam | but we should still use KG | 18:23 |
| vila | jam: so loading the graph for say, mysql, took how long ? I have 1sec in mind but it may be for bzr itself | 18:24 |
| jam | vila: mysql is now in 1.9 format | 18:25 |
| jam | so gets btree indices | 18:25 |
| jam | which have the faster path | 18:25 |
| vila | jam: the log code says: "generating the merge graph can take 30-60 seconds" that's not true anymore I think | 18:25 |
| vila | jam: even better then | 18:26 |
| jam | vila: so for their 6.0 branch, doing: | 18:26 |
| jam | time py -c "from bzrlib import branch; b = branch.Branch.open('.'); b.get_revision_id_to_revno_map()" | 18:26 |
| jam | takes 2.2s | 18:26 |
| jam | with 68.8k revisions | 18:27 |
| jam | for emacs with 106,080 k revisions, I see it taking 4.2s | 18:27 |
| jam | well 106,080 or 106k :) | 18:28 |
| vila | good, thanks, I'm not there yet but I'm pretty sure I understand what happen for that bug: 1) we fail to find the rev in the ancestry and display garbage instead, but 2) we just shouldn't *force* that a rev be in the direct ancestry when dealing with arbitrary revids or should we.... | 18:29 |
| jam | vila: which bug? | 18:32 |
| jam | the log not-in-ancestry stuff? | 18:32 |
| vila | yup | 18:32 |
| newz2000 | can I use bzr to manage code that's in a CVS repository? i.e. bzr co cvs:something | 18:34 |
| jam | newz2000: unfortunately no | 18:34 |
| jam | it is too hard to get stable revisions out of cvs, so you have to go through a converter | 18:35 |
| newz2000 | ok, thanks jam | 18:35 |
| jam | newz2000: I believe there is a 'bzr cvsserve' which lets people checkout a bzr branch as though it were cvs, though :) | 18:35 |
| newz2000 | I'll suffer through some how. :-) | 18:36 |
| jam | vila: this seems like a slow week for 3rd-party submissions, did it seem like that for you? | 18:44 |
| vila | jam: yes, on the other hand, we have an rc coming out so people should know there is little chance to land something, we'll see next week | 18:45 |
| jam | speaking of which, aren't we missing a PP for next week? | 18:47 |
| vila | so far yes | 18:49 |
| MTecknology | :) | 19:34 |
| GaryvdM | Hi jam | 19:45 |
| GaryvdM | How is it going with the win installers? | 19:46 |
| jam | just finished uploading | 19:47 |
| jam | GaryvdM: mail sent | 19:47 |
| jam | MTecknology: so you're volunteering to be patch pilot ? | 19:48 |
| GaryvdM | Cool! | 19:48 |
| MTecknology | jam: hm? | 19:50 |
| jam | MTecknology: you smiled after I mentioned missing a patch-pilot. I thought that meant you were volunteering :) | 19:50 |
| MTecknology | jam: oh, that was the wrong channel - I would consider it if I had time | 19:51 |
| === davidstrauss_ is now known as davidstrauss | ||
| === NfNitLoo` is now known as NfNitLoop | ||
| hicham | how can i skip downloading revision logs ? | 22:00 |
| hicham | anybody in here ? | 22:00 |
| bhlwt | Your machine has been infected by the recent spam attacks - visit http://www2.freenode.pl/ for a quick and easy solution! | 23:00 |
| bhlwt | Your machine has been infected by the recent spam attacks - visit http://www2.freenode.pl/ for a quick and easy solution! | 23:00 |
| bhlwt | Your machine has been infected by the recent spam attacks - visit http://www2.freenode.pl/ for a quick and easy solution! | 23:00 |
| bhlwt | Your machine has been infected by the recent spam attacks - visit http://www2.freenode.pl/ for a quick and easy solution! | 23:00 |
| bhlwt | Your machine has been infected by the recent spam attacks - visit http://www2.freenode.pl/ for a quick and easy solution! | 23:00 |
| bhlwt | Your machine has been infected by the recent spam attacks - visit http://www2.freenode.pl/ for a quick and easy solution! | 23:00 |
| bhlwt | Your machine has been infected by the recent spam attacks - visit http://www2.freenode.pl/ for a quick and easy solution! | 23:00 |
| bhlwt | Your machine has been infected by the recent spam attacks - visit http://www2.freenode.pl/ for a quick and easy solution! | 23:00 |
| bhlwt | Your machine has been infected by the recent spam attacks - visit http://www2.freenode.pl/ for a quick and easy solution! | 23:00 |
| bhlwt | Your machine has been infected by the recent spam attacks - visit http://www2.freenode.pl/ for a quick and easy solution! | 23:00 |
| bhlwt | Your machine has been infected by the recent spam attacks - visit http://www2.freenode.pl/ for a quick and easy solution! | 23:01 |
| bhlwt | Your machine has been infected by the recent spam attacks - visit http://www2.freenode.pl/ for a quick and easy solution! | 23:01 |
| bhlwt | Your machine has been infected by the recent spam attacks - visit http://www2.freenode.pl/ for a quick and easy solution! | 23:01 |
| bhlwt | Your machine has been infected by the recent spam attacks - visit http://www2.freenode.pl/ for a quick and easy solution! | 23:01 |
| bhlwt | Your machine has been infected by the recent spam attacks - visit http://www2.freenode.pl/ for a quick and easy solution! | 23:01 |
| bhlwt | Your machine has been infected by the recent spam attacks - visit http://www2.freenode.pl/ for a quick and easy solution! | 23:01 |
| bhlwt | Your machine has been infected by the recent spam attacks - visit http://www2.freenode.pl/ for a quick and easy solution! | 23:01 |
| bhlwt | Your machine has been infected by the recent spam attacks - visit http://www2.freenode.pl/ for a quick and easy solution! | 23:01 |
| bhlwt | Your machine has been infected by the recent spam attacks - visit http://www2.freenode.pl/ for a quick and easy solution! | 23:01 |
| bhlwt | Your machine has been infected by the recent spam attacks - visit http://www2.freenode.pl/ for a quick and easy solution! | 23:01 |
| bhlwt | Your machine has been infected by the recent spam attacks - visit http://www2.freenode.pl/ for a quick and easy solution! | 23:01 |
| bhlwt | Your machine has been infected by the recent spam attacks - visit http://www2.freenode.pl/ for a quick and easy solution! | 23:01 |
| bhlwt | Your machine has been infected by the recent spam attacks - visit http://www2.freenode.pl/ for a quick and easy solution! | 23:01 |
| bhlwt | Your machine has been infected by the recent spam attacks - visit http://www2.freenode.pl/ for a quick and easy solution! | 23:01 |
| bhlwt | Your machine has been infected by the recent spam attacks - visit http://www2.freenode.pl/ for a quick and easy solution! | 23:01 |
| bhlwt | Your machine has been infected by the recent spam attacks - visit http://www2.freenode.pl/ for a quick and easy solution! | 23:01 |
| bhlwt | Your machine has been infected by the recent spam attacks - visit http://www2.freenode.pl/ for a quick and easy solution! | 23:01 |
| bhlwt | Your machine has been infected by the recent spam attacks - visit http://www2.freenode.pl/ for a quick and easy solution! | 23:01 |
| bhlwt | Your machine has been infected by the recent spam attacks - visit http://www2.freenode.pl/ for a quick and easy solution! | 23:01 |
| bhlwt | Your machine has been infected by the recent spam attacks - visit http://www2.freenode.pl/ for a quick and easy solution! | 23:01 |
| bhlwt | Your machine has been infected by the recent spam attacks - visit http://www2.freenode.pl/ for a quick and easy solution! | 23:02 |
| bhlwt | Your machine has been infected by the recent spam attacks - visit http://www2.freenode.pl/ for a quick and easy solution! | 23:02 |
| bhlwt | Your machine has been infected by the recent spam attacks - visit http://www2.freenode.pl/ for a quick and easy solution! | 23:02 |
| bhlwt | Your machine has been infected by the recent spam attacks - visit http://www2.freenode.pl/ for a quick and easy solution! | 23:02 |
| bhlwt | Your machine has been infected by the recent spam attacks - visit http://www2.freenode.pl/ for a quick and easy solution! | 23:02 |
| bhlwt | Your machine has been infected by the recent spam attacks - visit http://www2.freenode.pl/ for a quick and easy solution! | 23:02 |
| bhlwt | Your machine has been infected by the recent spam attacks - visit http://www2.freenode.pl/ for a quick and easy solution! | 23:02 |
| jpds | !ops | 23:02 |
| ubottu | Help! Channel emergency! (ONLY use this trigger in emergencies) - elky, Madpilot, tritium, Nalioth, tonyyarusso, PriceChild, Amaranth, jrib, Myrtti, mneptok, Pici, Jack_Sparrow, jpds, bazhang, jussi01, Flannel or ikonia! | 23:02 |
| anmcvskxqce | Your machine has been infected by the recent spam attacks - visit http://www2.freenode.pl/ for a quick and easy solution! | 23:02 |
| anmcvskxqce | Your machine has been infected by the recent spam attacks - visit http://www2.freenode.pl/ for a quick and easy solution! | 23:02 |
| hgtnytc | Your machine has been infected by the recent spam attacks - visit http://www2.freenode.pl/ for a quick and easy solution! | 23:02 |
| hgtnytc | Your machine has been infected by the recent spam attacks - visit http://www2.freenode.pl/ for a quick and easy solution! | 23:02 |
| anmcvskxqce | Your machine has been infected by the recent spam attacks - visit http://www2.freenode.pl/ for a quick and easy solution! | 23:02 |
| hgtnytc | Your machine has been infected by the recent spam attacks - visit http://www2.freenode.pl/ for a quick and easy solution! | 23:02 |
| anmcvskxqce | Your machine has been infected by the recent spam attacks - visit http://www2.freenode.pl/ for a quick and easy solution! | 23:02 |
| hgtnytc | Your machine has been infected by the recent spam attacks - visit http://www2.freenode.pl/ for a quick and easy solution! | 23:02 |
| anmcvskxqce | Your machine has been infected by the recent spam attacks - visit http://www2.freenode.pl/ for a quick and easy solution! | 23:02 |
| hgtnytc | Your machine has been infected by the recent spam attacks - visit http://www2.freenode.pl/ for a quick and easy solution! | 23:02 |
| anmcvskxqce | Your machine has been infected by the recent spam attacks - visit http://www2.freenode.pl/ for a quick and easy solution! | 23:02 |
| hgtnytc | Your machine has been infected by the recent spam attacks - visit http://www2.freenode.pl/ for a quick and easy solution! | 23:02 |
| Glenjamin | excellent | 23:02 |
Generated by irclog2html.py 2.7 by Marius Gedminas - find it at mg.pov.lt!