| m3ga | on karmic, have bzr 1.18-0ubuntu1 and python-paramiko 1.7.4-0.1 installed, trying to pull from sftp url and getting "Unable to import paramiko (required for sftp support): No module named paramiko". Clues? | 00:03 |
|---|---|---|
| m3ga | hmm, did "apt-get install --reinstall python-paramiko" and that fixed it. weird! | 00:06 |
| Peng_ | Wasn't there a plan to quiet all of the muttering in groupcompress's _trim_block and _rebuild_block? | 00:13 |
| Peng_ | "creating new compressed block on-the-fly in 0.177s 618357 bytes => 293599 bytes" and all. | 00:13 |
| jelmer | "bzr branch hg.hg hg.bzr" now works and takes less than 5 minutes :-) | 00:19 |
| jelmer | it still needs more work (corner cases, tests, memory usage improvements) but the basis is there | 00:19 |
| Peng_ | hg -> bzr? Wow. | 00:20 |
| jelmer | Peng_: yep. It's a local conversion though, not sure what it would take to clone a remote hg repo | 00:21 |
| Peng_ | Does it use the Mercurial Python library or what? | 00:22 |
| jelmer | Peng_: Yeah | 00:22 |
| Peng_ | Very cool. :) | 00:23 |
| Peng_ | Is it read-only? | 00:23 |
| lifeless | Peng_: we had it 3 years back, but it bitrotted :) | 00:27 |
| lifeless | jelmer: I'm very glad you've cleaned it up and made it work well | 00:27 |
| hoelzro | hello bzr devs and users, I'm trying to do the following: 'bzr branch lp:gwibber' and I get a strange error | 00:36 |
| hoelzro | bzr: ERROR: Invalid url supplied to transport: "lp:gwibber": OOPS-1362ED11069 | 00:36 |
| ubottu | https://lp-oops.canonical.com/oops.py/?oopsid=1362ED11069 | 00:36 |
| lifeless | launchpad is in maintenance at the moment | 00:37 |
| lifeless | thumper: ^ bugworthy? | 00:37 |
| hoelzro | ubottu: auth required =( | 00:37 |
| ubottu | Error: I am only a bot, please don't think I'm intelligent :) | 00:37 |
| hoelzro | lifeless: I noticed, but the repos are read only, so it should work, right? | 00:38 |
| zsquareplusc | the lp: shortcut uses the smart server, i guess it would work if you use a http: url manually | 00:40 |
| zsquareplusc | at least that's what i observed last time i had problems being behind a proxy and firewall | 00:40 |
| lifeless | zsquareplusc: thats not really connected to this issue | 00:41 |
| jelmer | peng_: yeah, it's read-only for now | 00:41 |
| lifeless | hoelzro: yes it should work | 00:41 |
| mwhudson | lifeless: the lp-resolution problem is already reported | 00:43 |
| zsquareplusc | lifeless: my idea was that http should work as it's guaranteed read only. "lp:" doesn't use http i think | 00:43 |
| mwhudson | (reported by me, just after the last rollout) | 00:43 |
| lifeless | zsquareplusc: lp: will use http if you're not logged in, and http still does db access | 00:43 |
| lifeless | zsquareplusc: all of launchpad *should* work in readonly mode, with write *attempts* failing. branching isn't a write attempt. | 00:43 |
| wgrant | But codehosting is entirely down during read-only mode ATM. | 00:44 |
| thumper | lifeless: LP is in readonly | 00:47 |
| thumper | lifeless: we need better errors | 00:47 |
| thumper | lifeless: so yes, bug worthy | 00:47 |
| poolie | igc: did you see ej around at all? | 01:13 |
| igc | morning | 01:34 |
| igc | poolie: I didn't | 01:34 |
| GPHemsley | I upgraded to 1.18 from 1.14 and I got this error when I ran `bzr version`: "Key 'foreign-mapping-upgrade' already registered" | 01:49 |
| GPHemsley | Unable to load plugin 'rebase' from '/Library/Frameworks/Python.framework/Versions/2.5/lib/python2.5/site-packages/bzrlib/plugins' | 01:49 |
| lifeless | you need to upgrade your plugins too | 01:52 |
| GPHemsley | I thought I did | 01:53 |
| GPHemsley | lifeless: Doesn't the installer do that? | 01:54 |
| GPHemsley | (Mac OS X 10.4) | 01:54 |
| meoblast001 | hi again | 02:03 |
| meoblast001 | if you use fast-import to filter a directory out, does it work on all files within it? | 02:04 |
| GPHemsley | hmm... unusually quiet tonight... | 02:08 |
| meoblast001 | hm | 02:10 |
| lifeless | GPHemsley: only the plugins it included; you may have installed others | 02:11 |
| lifeless | GPHemsley: also I think there was a bug in the 1.18 installer or something, now that I think about it | 02:11 |
| GPHemsley | meh | 02:11 |
| GPHemsley | I seem to recall that being the case a couple of version ago, too :( | 02:12 |
| GPHemsley | actually, yeah, this problem was causing trouble the last time I was here | 02:21 |
| GPHemsley | when I was trying to get svn-bzr (or bzr-svn, I forget) to work | 02:21 |
| lifeless | your bzr.log should show the path to the failin import | 02:22 |
| === SamB_XP_ is now known as SamB_XP | ||
| GPHemsley | lifeless: http://gphemsley.pastebin.com/d20033a0a | 02:24 |
| lifeless | GPHemsley: it does look like an old rebase to me | 02:32 |
| GPHemsley | lifeless: It's 0.5.4, from what I can gather | 02:33 |
| GPHemsley | oh | 02:34 |
| GPHemsley | hmm | 02:34 |
| GPHemsley | bzr_plugin_version = (0, 5, 4, 'dev', 0) | 02:34 |
| GPHemsley | bzr_compatible_versions = [(1, 14, 0), (1, 15, 0), (1, 16, 0), (1, 17, 0)] | 02:34 |
| GPHemsley | I may have compiled this myself when I was having the problem with svn | 02:34 |
| GPHemsley | lifeless: WCS, how do I uninstall these plugins? | 02:40 |
| poolie | igc, i'll try to set up the site somewhere on orcadas this afternoon | 02:42 |
| lifeless | GPHemsley: delete the directory | 02:46 |
| RenatoSilva | lifeless: hi, it seems that the diff generated by bzr diff -r ancestor:lp:moin-solenoid on the update-merged branch is exactly the same for -r 22..23 on rebased one :) | 02:46 |
| GPHemsley | oh, that simple? | 02:46 |
| lifeless | GPHemsley: yes, plugins are discovered bywalking the directory layout on disk | 02:46 |
| RenatoSilva | lifeless: but the problem is: how to make that diff --after merging with trunk-- :( | 02:47 |
| RenatoSilva | lifeless: in the rebased branch, the diff can be extracted from the trunk, even after deleting the feature branch | 02:48 |
| RenatoSilva | lifeless: unsing branch diff, I need to keep all feature branches forever even after merging them into trunk | 02:49 |
| RenatoSilva | Is there a way to run a bzr diff -r ancestor:$trunk *after merging into trunk*? that is, some command on trunk that will result in the same diff | 02:50 |
| meoblast001 | ok, i successfully removed the contents of my examples/ directory from every revision of my project with the fast-import, but how do i actually remove the directory? | 02:52 |
| meoblast001 | >.< scratch that, i still have a 10 MB .pack file | 02:53 |
| RenatoSilva | sorry if I'm being unclear, am I? | 02:53 |
| meoblast001 | hm, seems like everything is smaller though | 02:54 |
| lifeless | RenatoSilva: it can without rebase too | 02:54 |
| lifeless | RenatoSilva: diff -c -1 | 02:54 |
| meoblast001 | i did this bzr fast-import-filter ame.fi -x examples/ > amethyst-mm/new.fi | 02:55 |
| meoblast001 | should i do bzr fast-import-filter ame.fi -x examples/ -x examples > amethyst-mm/new.fi | 02:55 |
| GPHemsley | Is there a way to edit the information of a commit after it's already been committed? | 02:56 |
| GPHemsley | specifically, the committer info | 02:56 |
| GPHemsley | (`bzr whoami`) | 02:57 |
| meoblast001 | you can reroll the whole repository, but i think that's overkill | 02:58 |
| igc | poolie: that would be great. I need to head off around 3pm for a medical appointment but I should be back later | 02:58 |
| lifeless | GPHemsley: imediatelt after you can use uncommit + commit | 02:58 |
| * igc lunch | 02:59 | |
| RenatoSilva | lifeless: oh! it's just a single diff command :) | 03:00 |
| GPHemsley | excellent, thanks, lifeless | 03:01 |
| RenatoSilva | lifeless: bzr diff -r 22..23, bzr knows here that 22 is a merge and switch to a branch diff, right | 03:02 |
| RenatoSilva | lifeless: I'll try to understand it later, what matters atm is that it just works :) | 03:03 |
| RenatoSilva | but because of the clearer history, it still seems to me that rebasing is a good option for "unbranchable" branches :) | 03:05 |
| meoblast001 | ugh :/ | 03:18 |
| meoblast001 | how do you filter out a directory with fast-export | 03:18 |
| lifeless | meoblast001: I don't know; I'm not answering because I don't know. | 03:20 |
| lifeless | meoblast001: if the docs don't tell you, file a bug about that; then ask a question on the project :) | 03:20 |
| meoblast001 | i read the help page | 03:20 |
| meoblast001 | lifeless: i honestly don't know if i'm understanding the docs | 03:23 |
| idnar | I also couldn't figure that out the other day, so I'd go ahead and file the bug | 03:27 |
| lifeless | meoblast001: if you can't understand it, it needs to be clearer :) | 03:27 |
| SamB | if you can't TELL, they still need to be clearer ;-P | 03:29 |
| meoblast001 | i'm not sure if it's actually addressing the point i'm wondering about, or not | 03:29 |
| meoblast001 | i don't think it is though | 03:29 |
| meoblast001 | i think it's just saying you need a trailing slash on directories (which i did) | 03:29 |
| lifeless | again, you're not sure. So its a bug. | 03:32 |
| lifeless | please file it? Pretty please? | 03:32 |
| meoblast001 | lifeless: i have to double check things before i file a bug, so i'll reread it again to make sure i didn't just have a "brain fart" | 03:33 |
| lifeless | meoblast001: we like bugs. | 03:34 |
| meoblast001 | ok, i checked it over, i understand it | 03:34 |
| lifeless | meoblast001: the fact that you can have a brain fart is usually a sign of something we can improve. Please share these opportunities with us! | 03:34 |
| SamB | meoblast001: well, file one anyway | 03:34 |
| meoblast001 | but i think the problem is that it's not deleting the directory | 03:34 |
| meoblast001 | only the contents of the directory | 03:34 |
| meoblast001 | lifeless: if i file a bug we'll hit 4294967296 bugs | 03:35 |
| meoblast001 | and we all know what happens then | 03:35 |
| RenatoSilva | meoblast001: there's another line of thinking where you just file a bug, even if it is invalid. In lp it can be converted to a question/answer. The point here is have a documentation of the issue itself, so that other people can find iformation about the same problem | 03:35 |
| RenatoSilva | meoblast001: for example you file a bug because you want Ubuntu blue. Then it's marked as won't fix. When other people go file the same bug, they'll find that bug and know that it won't be implemented. They can comment and ask please please. Maybe if millions of people do that Ubuntu could become blue someday :) | 03:36 |
| meoblast001 | RenatoSilva: i want Ubuntu to be blue to be honest | 03:38 |
| meoblast001 | ouch, my eyes | 03:38 |
| RenatoSilva | meoblast001: well, me too :) | 03:38 |
| meoblast001 | i want to switch to gNewSense sort of, it's a stripped down Ubuntu | 03:38 |
| meoblast001 | i wonder if Canonical would ever make gNewSense official :) | 03:38 |
| meoblast001 | they would need permission from it's creators (one of which i know on IRC) | 03:39 |
| lifeless | I'm pretty sure we'd be delighted to be able to stop shipping firmware etc, but its very bad for users to do that at the moment. | 03:41 |
| meoblast001 | bad for users to do? | 03:43 |
| meoblast001 | someone on Ubuntu brainstorm thinks i'm RMS :P | 03:44 |
| * RenatoSilva don't want Ubuntu blue, maybe | 03:44 | |
| RenatoSilva | is there any way to ignore spaces / tabs /line-break style on bzr diff? | 03:47 |
| lifeless | meoblast001: users being unable to use their own hardware | 03:47 |
| lifeless | RenatoSilva: content filters can do it; you need to be using 2.0.0 | 03:47 |
| meoblast001 | ah yes | 03:47 |
| meoblast001 | i recently had to use a firmware (i switched from NVIDIA to ATI) | 03:48 |
| meoblast001 | at least my drivers are freed now :) | 03:48 |
| RenatoSilva | lifeless: I'm worried about plugin compatibility like bzr-xmloutput and bzr-email | 03:48 |
| RenatoSilva | lifeless: I wonder whether UNIX diff command can do that too, it should I think | 03:49 |
| RenatoSilva | lifeless: if you just s/\r\n/\n, diff will think yo've replaced the file completely, when in fact it is semantically equal | 03:49 |
| lifeless | only for some languages | 03:50 |
| lifeless | other languages consider them semantically different | 03:50 |
| lifeless | [many of which are 'binary'] | 03:50 |
| RenatoSilva | because of style of line breaks ? o.O | 03:50 |
| meoblast001 | this is so strange | 03:51 |
| RenatoSilva | well a diff ignoring \s and kind of \n wouldn't be a real diff, e.g. for patching, it's just a nice view of the diff for the user | 03:52 |
| meoblast001 | my examples/ directory still exists :/, i wonder if specifying "examples/./" would help? | 03:52 |
| lifeless | meoblast001: filed the bug ? | 03:53 |
| meoblast001 | i'm not sure if it's a bug though | 03:53 |
| poolie | lifeless: you asked before 'did i commit a conflict' and i didn't mean to commit a conflict | 03:54 |
| poolie | and now i see spiv has also got conflict markers in his cleanups mp | 03:54 |
| poolie | so i suspect a bug in lp | 03:55 |
| poolie | thumper: ^^ | 03:55 |
| mwhudson | poolie: merge proposal diffs are merge --preview style diffs now | 03:55 |
| mwhudson | poolie: so conflicts are possible | 03:55 |
| spiv | Huh. | 03:56 |
| meoblast001 | lifeless: so you want me to file a bug? | 04:04 |
| lifeless | yes! | 04:05 |
| meoblast001 | even if it might not be one | 04:05 |
| meoblast001 | on bazaar? | 04:05 |
| meoblast001 | i should probably do it on this plugin | 04:05 |
| lifeless | mwhudson: thumper: will they update now? | 04:06 |
| lifeless | meoblast001: bug reports are a sign that something might be wrong, not a statement. | 04:06 |
| mwhudson | lifeless: yes | 04:06 |
| lifeless | meoblast001: and yes, on the plugin please. | 04:06 |
| lifeless | mwhudson: _THANKS_ | 04:06 |
| mwhudson | lifeless: thank abentley, i had nothing to do with it! | 04:06 |
| lifeless | it was to the team :) | 04:07 |
| lifeless | abentley: thanks | 04:07 |
| meoblast001 | lifeless: is this related https://bugs.launchpad.net/bzr-fastimport/+bug/410140 | 04:07 |
| ubottu | Launchpad bug 410140 in bzr-fastimport "pruning of empty directories" [Medium,Fix committed] | 04:07 |
| meoblast001 | it looks like a similar problem | 04:07 |
| meoblast001 | it appears from that bug that it should be fixed | 04:11 |
| meoblast001 | but i'm not seeing it here, and this is a fresh checkout | 04:11 |
| thumper | lifeless: the script isn't running | 04:13 |
| thumper | lifeless: but it should soon | 04:13 |
| thumper | lifeless: the losas have been busy | 04:13 |
| lifeless | thumper: naturally | 04:13 |
| meoblast001 | lifeless: https://bugs.launchpad.net/bzr-fastimport/+bug/435621 happy now? :P | 04:23 |
| ubottu | Launchpad bug 435621 in bzr-fastimport "Specifying Directories to Filter only Deletes Subdirectories/Files, Not the Directory Itself" [Undecided,New] | 04:23 |
| lifeless | meoblast001: thank you | 04:23 |
| meoblast001 | :) | 04:23 |
| meoblast001 | lifeless: i was just kidding, you're the one who helped m | 04:24 |
| meoblast001 | me* | 04:24 |
| meoblast001 | my only problem is that i planned to fix this by tonight >.< | 04:24 |
| RenatoSilva | what's a submit branch in zbr info? | 04:34 |
| RenatoSilva | *bzr | 04:36 |
| spiv | RenatoSilva: the default branch used by "bzr send", any maybe other things. | 04:38 |
| RenatoSilva | ok thanks | 04:38 |
| spiv | I sometimes use "bzr diff -r submit:" in my feature branches to see what I've changed vs. that branch (which is usually lp:bzr, for me). | 04:39 |
| RenatoSilva | isn't it bzr diff -r ancestor:$trunk? | 04:40 |
| spiv | Yes, that's often the same. | 04:41 |
| spiv | or rather, if $trunk in your example is the submit branch, then it's exactly the same. | 04:42 |
| spiv | But "submit:" is shorter to type :) | 04:43 |
| RenatoSilva | true, gotta write it down somewhere :) | 04:43 |
| meoblast001 | lifeless: i fixed it now :/ | 04:45 |
| meoblast001 | so the bug report was useless | 04:45 |
| * RenatoSilva doesn't like bugs that much either | 04:46 | |
| RenatoSilva | how to find revisions that fixed certain bug (committed with --fixes=) | 04:53 |
| RenatoSilva | can't find anything in bzr help diff | 04:53 |
| RenatoSilva | *log | 04:54 |
| meoblast001 | sleep time, good night | 04:58 |
| lifeless | vila: nice | 05:26 |
| vila | lifeless: ? | 05:27 |
| igc | bbl | 05:49 |
| poolie | hi vila | 06:00 |
| === BasicPRO is now known as BasicOSX | ||
| vila | poolie: not really there yet :-) I'll say 'hi' then... | 06:16 |
| poolie | ok :) | 06:17 |
| poolie | reading your new shell-like diff now | 06:26 |
| === oubiwann_ is now known as oubiwann | ||
| jtv | What's the proper way to get a revision's timestamp into a datetime? | 06:58 |
| jtv | (I should say timestamp plus timezone) | 06:58 |
| Peng_ | Oh god. Just thinking about that makes my brain shut down. | 07:00 |
| jtv | Peng_: I take it that's a "no" on an easy solution? | 07:02 |
| lifeless | ugh, where has the day gone | 07:02 |
| lifeless | jtv: it is one ? | 07:02 |
| jtv | lifeless: it's gone over here, to the west of you | 07:02 |
| Peng_ | jtv: That's my standard reaction to mention of datetime. | 07:02 |
| jtv | lifeless: that's what I thought, but when I try to subtract a timedelta, I get an error saying the timestamp was a float. | 07:03 |
| Peng_ | There shouldn't be anything bzr-specific about converting timestamp + tzoffset into a datetime. | 07:03 |
| Peng_ | Unless bzr has a nice API for it or something. | 07:03 |
| jtv | Peng_: the timezone offset doesn't seem to be the one that datetime.fromtimestamp expects. | 07:04 |
| lifeless | jtv: pydoc bzrlib.osutils | 07:05 |
| Peng_ | datetime.fromtimestamp can take timezone offsets? | 07:05 |
| jtv | Peng_: yup | 07:05 |
| lifeless | jtv: has bits in there. | 07:05 |
| jtv | lifeless: they all seem to involve turning it into text and then parsing that text though | 07:06 |
| jtv | seems brittle | 07:06 |
| lifeless | jtv: well, I"m not saying there is exactly what you need | 07:07 |
| lifeless | just that you should find the closest function, and then refactor it;) | 07:07 |
| jtv | I think I can use datetime.utcfromtimestamp | 07:07 |
| jtv | but then should I add the timezone to the timestamp, or subtract it? | 07:07 |
| jtv | Hmm... contrary to reason it also seems to produce a timezone-naïve datetime. | 07:08 |
| lifeless | the python datetime module? | 07:09 |
| vila | hi all | 07:10 |
| lifeless | you need to subclass tzinfo | 07:10 |
| jtv | lifeless: yes | 07:10 |
| jtv | !? | 07:10 |
| lifeless | have I mentioned I hate that module? | 07:10 |
| lifeless | have a look at subunit.iso8601 | 07:11 |
| lifeless | or if its bundled on your system is8601 | 07:11 |
| jtv | lifeless: you haven't mentioned it to me yet, but I'll have you know it wouldn't shock me | 07:11 |
| jtv | what is subunit? | 07:12 |
| * vila takes a deep breath and restart yet another build failing on a time related issue... | 07:12 | |
| lifeless | its a testing protocol library I develop | 07:13 |
| lifeless | its relevance here is simply that iso8601 is an MIT licenced module I embedded | 07:13 |
| vila | . o 0 ( The common cause between all of them seems to be..... using a virtual host.... ) | 07:13 |
| jtv | lifeless: I have an iso8601.py lying around. | 07:14 |
| lifeless | look for Yoinked | 07:14 |
| jtv | lifeless: nope | 07:14 |
| jtv | not found | 07:14 |
| lifeless | class Utc(tzinfo) | 07:15 |
| jtv | lifeless: got it on google | 07:15 |
| jtv | okayyyy... what's wrong with regular UTC? | 07:16 |
| jtv | datetime.fromtimestamp(revision.timestamp + revision.timezone, UTC) does complete successfully... the + is a guess though. | 07:17 |
| lifeless | jtv: where is UTC defined? its not in the datetime module ... | 07:18 |
| jtv | lifeless: pytz | 07:19 |
| lifeless | ah | 07:19 |
| lifeless | not in the stdlib :) | 07:19 |
| poolie | vila, shell-like-ears +1 | 07:23 |
| poolie | also http://www.phrases.org.uk/meanings/414550.html | 07:23 |
| vila | poolie: wow :D A bit of explanation may be ? Should I continue or should I stop using "shell-like" ? | 07:26 |
| poolie | continue :) | 07:26 |
| poolie | it's a nice name | 07:26 |
| lifeless | jtv: timezones | 07:26 |
| vila | Can it be interpreted as "we listen to you: we help you write tests" ? :D | 07:27 |
| jtv | lifeless: ? | 07:27 |
| lifeless | jtv: the offset is the offset of the time when it was recorded; so if it was recorded at +3600, you would subtract 3600 to get UTC | 07:27 |
| lifeless | however, what you probably want | 07:27 |
| lifeless | is fromtimestamp(timestamp, magic_tzinfo(offset)), | 07:28 |
| jtv | magic_tzinfo? | 07:28 |
| lifeless | you get to write that | 07:28 |
| lifeless | a factory to get the right thing from pytz, or curry a class on the fly | 07:28 |
| lifeless | datetime is _not_ a good example of easy to use API | 07:29 |
| vila | poolie: that's the kind of surprise I love after using a word (shell here) for more than 20 years without realizing some of its other meanings | 07:29 |
| jtv | lifeless: seems overkill... I don't give a rat's kidneys about the timezone—all I want is the UTC time. | 07:30 |
| * jtv fondly reminisces the lady who tried to get "the real time" from a stewardess on a transcontinental flight... | 07:31 | |
| jtv | (The continent in question being Eurasia) | 07:31 |
| jtv | "Yes but what time is it on the plane?" | 07:32 |
| * vila giggles about the TRUE things (time is a funny example of that, but many people also have strong views about pasta, chocolate, ice cream, you name it ;) | 07:33 | |
| jtv | vila: don't get me started about True Internet, basically the only alternative to state-run internet here... | 07:33 |
| vila | jtv: hehe | 07:36 |
| LarstiQ | kfogel: ah! I'm going to look at your merge proposal today (after all my lectures are over in ~9 hours). Sorry it took so long | 07:50 |
| ronny | jelmer: whats the purpose of subvertpy.NODE_NONE/NODE_UNKNOWN | 07:59 |
| ronny | jelmer: oh, and RemoteAccess.check_path doesnt normalize leading '/' | 08:00 |
| igc | back | 08:15 |
| jtv1 | lifeless: printf debugging tells me that the timestamp in a revision is already in UTC, so I can ignore the timezone. Just datetime.fromtimestamp(revision.timestamp, pytz.UTC) does the trick. | 08:21 |
| lifeless | jtv1: hmm, I'll have to check the source to be sure. | 08:21 |
| lifeless | time to learn more RDF | 08:22 |
| jtv1 | lifeless: I commit to a branch, then I look up the revision and run its timestamp through that, and it gives me (roughly) the current UTC time. | 08:23 |
| === jtv1 is now known as jtv | ||
| johnf | Can anyone besides abently do a bzrtools release? | 09:11 |
| johnf | jelmer: will you be doing a bzr-svn 1.0 release before tomorrow? | 09:13 |
| poolie | hi johnf! | 09:17 |
| johnf | poolie: howdy | 09:17 |
| bialix | hello bzr | 09:17 |
| poolie | johnf: i don't think anyone but abentley regularly _does_ releases | 09:18 |
| poolie | this is a drawback of having them version-locked and recommended by the package... | 09:18 |
| johnf | yeah | 09:18 |
| johnf | bzrtool 2.0.0 is released | 09:18 |
| johnf | but it expects bzr to be version 2.0 not 2.0.0 | 09:18 |
| johnf | I'll just fix it manually for now in the PPA | 09:19 |
| poolie | good idea | 09:19 |
| jelmer | johnf: no, I doubt I will have time for that. | 09:20 |
| johnf | I'd love to move to a process where when bzr goes rc1 all the plugins aim to do a final release or something. Trying to keep plugins in synx seems to be the most difficult task | 09:20 |
| johnf | jelmer: no probs I'll just use the rc | 09:20 |
| jelmer | johnf: there's still a couple of test failures that have to be fixed before a final release | 09:21 |
| johnf | jelmer: Are they major enough to not copy it to ~bzr PPA? | 09:21 |
| jelmer | johnf: no | 09:23 |
| * bialix shocked by new LP UI | 09:24 | |
| bialix | they killed Kenny! | 09:24 |
| thumper | bialix: you don't like it? | 09:24 |
| bialix | mmm, not really | 09:25 |
| bialix | I'm very conservative perhaps | 09:25 |
| bialix | and used to old UI | 09:25 |
| bialix | this new UI is TOO radical change for me | 09:25 |
| bialix | but my first reaction was not positive, sorry | 09:26 |
| bialix | although big green button for release downloads is definitely cool | 09:28 |
| bialix | never mind me | 09:29 |
| Peng_ | Is it...chartreuse? | 09:31 |
| * igc dinner | 09:54 | |
| === doko_ is now known as doko | ||
| garyvdm | Hi all | 11:19 |
| garyvdm | Please will someone take a look at https://code.edge.launchpad.net/~garyvdm/bzr/get_trees_and_branches_to_diff/+merge/12077 </nag> | 11:20 |
| Peng_ | garyvdm: There's no newline at the end of test_diff.py. :P | 11:22 |
| garyvdm | Peng_: Ok - I'll fix that. | 11:22 |
| Peng_ | I don't have the knowledge to do real reviews, but I figure my nitpicking makes things a little cleaner, and saves someone else from having to think about it... | 11:25 |
| Peng_ | Thus Peng_ explains the justification for his existence. | 11:25 |
| Peng_ | I should've gone with "In which Peng_ attempts to justify his existence." instead. | 11:26 |
| AfC | Peng_ is clearly attempting to pass the Turing test. | 11:27 |
| garyvdm | Superseded request: https://code.edge.launchpad.net/~garyvdm/bzr/get_trees_and_branches_to_diff/+merge/12341 | 11:29 |
| strk | error: must supply either home or prefix/exec-prefix -- not both | 11:30 |
| strk | ^^^ following instructions in the INSTALL file | 11:30 |
| strk | being: python setup.py install --home ~ | 11:30 |
| strk | bzr-2.0rc2 | 11:30 |
| strk | Python 2.6 | 11:30 |
| Peng_ | strk: That's exactly the command line you ran? | 11:37 |
| strk | python setup.py install --home $HOME | 11:38 |
| strk | python setup.py install --home ~ | 11:38 |
| strk | tried both.. | 11:38 |
| strk | same error | 11:38 |
| Peng_ | .....Huh. | 11:38 |
| garyvdm | strk: I think what you want is python setup.py install --home | 11:39 |
| bialix | hi garyvdm | 11:39 |
| garyvdm | Hi Alex | 11:40 |
| bialix | can you refresh my memory: why qbzr needs branches for diff? | 11:40 |
| strk | error: option --home requires argument | 11:41 |
| strk | garyvdm: ^^ | 11:41 |
| strk | for: python setup.py install --home | 11:41 |
| garyvdm | To get the revno for the revisions to display in the title, and if the branches are different, it also show the locations of the branches. | 11:41 |
| garyvdm | strk: sorry - I don't know then. | 11:42 |
| bialix | garyvdm: ok, understood | 11:42 |
| * garyvdm -> lunch | 11:42 | |
| * bialix too | 11:42 | |
| Peng_ | Does installing other Python apps work? | 11:44 |
| strk | haven't tried | 11:44 |
| strk | lemme try paramiko... | 11:45 |
| strk | alright, same error with that command line for paramiko | 11:47 |
| strk | using --prefix instead of --home seems to work fine for bzr | 11:48 |
| strk | worth noticing in the INSTALL file | 11:49 |
| === strk is now known as strk_lunch | ||
| asabil | hi all | 12:25 |
| asabil | I have a small query concerning qbzr | 12:25 |
| asabil | maybe qbzr log should sort revisions based on the commit timestamp when there is a tie about what to show | 12:26 |
| asabil | I have got multiple release branches that represent the release series, and that are not merged in the mainline and will never be | 12:26 |
| asabil | qlog shows the release branches at the top of the graph even if the commit is 2 months old | 12:27 |
| johnf | jelmer: what should I be branching off to create debian packages of bzr-svn? http://bzr.debian.org/pkg-bazaar/bzr-svn/unstable | 12:38 |
| garyvdm | asabil: https://bugs.launchpad.net/qbzr/+bug/321389 | 12:52 |
| ubottu | Launchpad bug 321389 in qbzr "bzr visualise: sort by date" [Low,Confirmed] | 12:52 |
| asabil | garyvdm: ah thanks, didn't see that one | 12:52 |
| jelmer | johnf: yeah | 13:21 |
| === strk_lunch is now known as strk | ||
| jelmer | johnf: I've just released 1.0 btw | 13:22 |
| lifeless | johnf: theres a new loom release too :) | 13:22 |
| johnf | jelmer: Also I finally got back my DD status today. So when you have a moment would like to talk about the bzr-pkg team and how to start helping out | 13:22 |
| * lifeless shoves work johnf's way | 13:22 | |
| lifeless | johnf: package shit & up load it ;) ? | 13:22 |
| johnf | lifeless: I'm in total package mode and aim to keep working through plugins till midnight :) Feel free to prioritise. bzr-svn is at the top of the list | 13:23 |
| lifeless | johnf: loom isn't high, but would be nice to have; it breaks switch -b rather badly using the packaged version :) | 13:23 |
| jelmer | johnf: bzr-loom in debian needs some work in particular | 13:24 |
| lifeless | jelmer: what does it need? | 13:24 |
| jelmer | lifeless: somebody to keep an eye on it mainly | 13:24 |
| johnf | Although I fell I'm about to be sidetracked by continuing jelmer's work from a year ago and making autoppa use builddeb | 13:24 |
| jelmer | lifeless: and I think you have an open bug about it being out of date | 13:24 |
| jelmer | johnf: I've also orphaned trac-bzr earlier, you might want to pick it up if it interests you. | 13:27 |
| james_w | yay johnf | 13:28 |
| garyvdm | johnf: I would like to get qbzr in to debian. I got to run now, so I'll send you a mail... | 13:30 |
| Lo-lan-do | johnf: I'm half inclined to start a bzr-miscplugins package. | 13:31 |
| Lo-lan-do | I'd shove bookmarks and extcommand into there. | 13:32 |
| lifeless | jelmer: its out of date cause it hasn't been updated ;P | 13:32 |
| lifeless | What I'd like to do is plugin-info -> debian/control | 13:32 |
| lifeless | and bzr-log -> debian/changelog | 13:32 |
| lifeless | possibly wants doap rather than plugin-info | 13:33 |
| jelmer | lifeless: we did a simple script that does the first bit (plugin-info -> debian/control) at debconf | 13:33 |
| jelmer | lifeless: basically will update dependencies on bzr based on info in plugin-info | 13:33 |
| lifeless | jelmer: cool | 13:33 |
| lifeless | jelmer: have you seen moap? | 13:34 |
| jelmer | lifeless: yes | 13:34 |
| jelmer | lifeless: I mentioned it in my reply to you about doap | 13:34 |
| garyvdm | Bye all. | 13:34 |
| lifeless | jelmer: oh hmm, must have dropped that mail somewhere | 13:38 |
| lifeless | I spent this avo looking at rdf tools; rather a sad landscape after so many years | 13:39 |
| jelmer | lifeless: indeed | 13:39 |
| jelmer | lifeless: I can forward that email again if you can't find it. It contains some complaints about moap :-) | 13:40 |
| lifeless | please | 13:40 |
| lifeless | ah found it | 13:41 |
| lifeless | you did a pile of bug noise after it | 13:41 |
| lifeless | I'm crashingish, too tired to reason well | 13:42 |
| OllieR | How do you find out what version a checkout is on? | 14:13 |
| IslandUsurper | bzr revno | 14:14 |
| OllieR | thats tells you the latest revno of the tree not what the local checkout is updated to... | 14:17 |
| fullermd | The branch, not the tree. revno --tree tells yo uabout the working tree. | 14:21 |
| jelmer | hmm, could it be that 2.0rc2 isn't tagged yet? | 14:22 |
| OllieR | fullermd: ty :) | 14:31 |
| OllieR | IslandUsurper: thank you (should of looked up its parameters) | 14:31 |
| === strk is now known as strk_away | ||
| OllieR | is it possible to update just one file in bzr like you can in svn? | 14:57 |
| bialix | тщ | 14:59 |
| bialix | no | 14:59 |
| kfogel | LarstiQ: cool | 15:00 |
| OllieR | isn't that a major drawback to bzr? | 15:01 |
| kfogel | OllieR: not really. You could always just duplicate the branch (cheap, in a shared repository), update the copy, and use that version of the file. | 15:04 |
| IslandUsurper | I don't think so. About the only time files are truly independent of each other are when they are binary files, and Bazaar doesn't handle those very well anyway | 15:05 |
| IslandUsurper | it's better to think of revisions as snapshots of the whole project, not separate snapshots of each file | 15:05 |
| OllieR | kfogel: interesting book :) | 15:05 |
| kfogel | IslandUsurper: (how does Bazaar not handle binary files well? just curious) | 15:05 |
| kfogel | OllieR: thank you :-). | 15:05 |
| IslandUsurper | kfogel, if they're changed a lot, the changes don't pack very efficiently, so it slows bzr down | 15:06 |
| kfogel | IslandUsurper: ah, gotcha. | 15:06 |
| james_w | IslandUsurper: I don't think that's the case | 15:06 |
| james_w | not any more at leat | 15:07 |
| IslandUsurper | james_w, oh, well that's good to hear | 15:07 |
| james_w | though if you are storing random data it's not going to compress different versions very well | 15:07 |
| james_w | and I wouldn't expect too much extra compression on changes to files that are themselves compressed | 15:07 |
| IslandUsurper | I'm just going off hearsay, anyway | 15:08 |
| james_w | in the past bzr only did line based storage, so depending on the data that might not work very well at all | 15:09 |
| jblount | Hi! How do I tell bzr that the branch I'm merging in should have preference over my existing branch? | 15:09 |
| james_w | if there were zero \n bytes in the file the storage would be one line that changed completely every time | 15:09 |
| james_w | that obviously doesn't work too well | 15:10 |
| james_w | jblount: hey, preference in what way? | 15:10 |
| jblount | Something like: bzr merge lp:~someguy/project/some-work --please-use-these-changes-not-my-branch | 15:10 |
| james_w | pull? | 15:10 |
| jblount | james_w: the branch I'm merging wins over the existing branch. | 15:10 |
| james_w | you want to resolve all conflicts in favour of OTHER? | 15:10 |
| james_w | or you just want to use everything in that branch? | 15:10 |
| jblount | james_w: resolve conflicts in favour of OTHER (I think) | 15:11 |
| james_w | ok | 15:11 |
| james_w | there's no clean way to do that currently unfortunately | 15:11 |
| james_w | you're stuck with "bzr merge" and then fix up afterwards | 15:12 |
| kfogel | james_w: :-( | 15:12 |
| james_w | for i in $(bzr conflicts --text); do mv $i.OTHER $i; done; bzr resolve | 15:12 |
| james_w | that will get you most of them | 15:12 |
| james_w | bzr conflicts will then list the tricky ones | 15:12 |
| jblount | james_w: I'll try that. Thanks for the clarity :) | 15:12 |
| james_w | and I can't come up with a shell fragment to fix them up off the top of my head | 15:13 |
| james_w | jblount: please file a bug though, this would be something that would be useful to have | 15:13 |
| jblount | james_w: Will do! | 15:13 |
| kfogel | james_w: https://bugs.edge.launchpad.net/bzr/+bug/257297 | 15:14 |
| ubottu | Launchpad bug 257297 in bzr "Add option to resolve to either THIS or OTHER" [Low,Confirmed] | 15:14 |
| kfogel | james_w: https://bugs.edge.launchpad.net/bzr/+bug/232512 | 15:14 |
| ubottu | Launchpad bug 232512 in bzr "Command line tool for resolving all conflicts in favor of 'merge-source'" [Wishlist,Confirmed] | 15:14 |
| kfogel | james_w: I think one of those might be a dup of the other | 15:14 |
| james_w | aha | 15:14 |
| kfogel | james_w: on phone, so can't look further right now | 15:14 |
| james_w | thanks kfogel | 15:14 |
| james_w | and hi :-) | 15:14 |
| kfogel | james_w: np, and hi! :-) | 15:14 |
| jblount | kfogel: Thanks! | 15:14 |
| james_w | kfogel: are you in London at the moment/soon? | 15:14 |
| james_w | jblount: ooh | 15:15 |
| james_w | check Aaron's comment in bug 232512 | 15:15 |
| ubottu | Launchpad bug 232512 in bzr "Command line tool for resolving all conflicts in favor of 'merge-source'" [Wishlist,Confirmed] https://launchpad.net/bugs/232512 | 15:15 |
| kfogel | jblount: my personal goal is to organize the world's information and make it universa... Oh, wait. | 15:15 |
| kfogel | james_w: no, in NY, but in London next week. | 15:15 |
| james_w | kfogel: cool, might catch you then | 15:15 |
| kfogel | james_w: +1 you know about the launchpad meetup monday, right? | 15:16 |
| jblount | kfogel: I'll sadly miss the LP meetup next week, but hanging out with beuno and crew this week in Millbank. | 15:16 |
| james_w | kfogel: I do, I don't know if I'll still be in London then though | 15:16 |
| kfogel | jblount: ah dang, but cool you're in Millbank now. | 15:18 |
| kfogel | james_w: hope you can make it! | 15:18 |
| === OllieR is now known as ORattie | ||
| === ORattie is now known as ORattue | ||
| === ORattue is now known as orattue | ||
| bialix | thumper: I think I can articulate why new UI is shocked: absence of lines, borders around buttons, too much white background in which letters fly as in outer space. | 16:09 |
| jelmer | lifeless: any chance you could have a look at https://code.edge.launchpad.net/~jelmer/pqm/merge/+merge/6122 ? | 16:09 |
| === cprov is now known as cprov-lunch | ||
| === Island_Usurper is now known as IslandUsurper | ||
| kfogel | LarstiQ: eventually I will run https://code.edge.launchpad.net/~kfogel/bzr-hookless-email/byte-limit/+merge/11233 through a lolcatz filter. Don't say I didn't warn you :-). | 16:56 |
| === IslandUsurper is now known as Island|away | ||
| LarstiQ | kfogel: euh :) | 17:01 |
| === cprov-lunch is now known as cprov | ||
| === deryck is now known as deryck[lunch] | ||
| === Island|away is now known as IslandUsurper | ||
| sque | I am not sure if this is the right place to ask. But can someone please explain me what (loggerhead's) serve-branch --user-dir exactly does? This thing comes with no ducemantation at all. | 18:28 |
| beuno | sque, | 18:31 |
| beuno | --user-dirs Serve user directories as ~user | 18:31 |
| beuno | ./serve-branches --help? | 18:31 |
| sque | beuno, have you used it? | 18:32 |
| sque | beuno, If you set this arguments it demands to set --trunk-dir too. What should I do there? | 18:33 |
| sque | beuno, I tried various configurations but didn't managed to do http://loggerhead-server/~sque and work | 18:33 |
| sque | beuno, bbl in 10 minutes. | 18:39 |
| sque | I hope you have a clue for me to solve this puzzle :) | 18:40 |
| === deryck[lunch] is now known as deryck | ||
| davidstrauss | I can't help but notice that Bazaar 2.0 is recommended from the Launchpad blog but not actually released yet. | 18:59 |
| jam | davidstrauss: the code is cut, the official announcement hasn't happened because we haven't built all the installers yet | 19:02 |
| davidstrauss | jam: Since when did installers hold back a release? ;-) | 19:02 |
| jam | davidstrauss: for 1.18 and 2.0 and onwards | 19:03 |
| davidstrauss | ah | 19:03 |
| jam | we now have a "gone gold" | 19:03 |
| jam | separate from "officially released, come get some" | 19:03 |
| davidstrauss | jam: 1.18 still lacks an os x 10.5 installer | 19:03 |
| jam | I'm a bit surprised that launchpad blog would announce it before we do... | 19:03 |
| davidstrauss | jam: http://blog.launchpad.net/releases/launchpad-3-0-is-here-new-ui-and-more | 19:03 |
| jam | davidstrauss: apparently mac installers are a very manual and painful process | 19:04 |
| davidstrauss | "To use Bazaar’s new 2a repositories, you should upgrade to Bazaar 2.0." | 19:04 |
| davidstrauss | jam: Yes, I've build them for Bazaar before. | 19:04 |
| === EdwinGrubbs is now known as Edwin-lunch | ||
| Tak | what can I do about a DirstateCorrupt error? | 19:08 |
| Tak | suicide? | 19:09 |
| james_w | Tak: "mv .bzr/checkout /tmp/; bzr checkout; bzr status" should fix you up | 19:13 |
| james_w | then looking at /tmp/checkout/dirstate might give a clue as to what happened | 19:13 |
| james_w | usually it is truncated | 19:13 |
| Tak | I think what happened is that I was trying to pull while something else was trying to look at statuses | 19:24 |
| james_w | that shouldn't cause a problem | 19:25 |
| james_w | it is supposed to have locking so that that will not cause this | 19:26 |
| james_w | there may be bugs though | 19:26 |
| LarstiQ | kfogel: you online by chance? | 19:28 |
| jfroy|work | jelmer: Congratulations on bzr-svn 1.0. Been a long time coming ;) | 19:34 |
| Tak | james_w: hmm, that fixed it; not really any indication as to what the issue was, other than the aforementioned | 19:42 |
| meoblast001 | hi | 20:17 |
| meoblast001 | i have a question.... this isn't necessary that i'm able to do this, but it would help if i could... is there a way to rewrite old commit messages? | 20:17 |
| === Edwin-lunch is now known as EdwinGrubbs | ||
| === cprov is now known as cprov-afk | ||
| zsquareplusc | meoblast001: when the branch is published you'll have different comment for the same rev.. | 20:25 |
| meoblast001 | ? | 20:25 |
| zsquareplusc | well if you publish your branch and then you edit the history | 20:26 |
| zsquareplusc | so someone else could have a copy of your old commit message | 20:26 |
| meoblast001 | doubt it, my project isn't too popular yet | 20:27 |
| zsquareplusc | meoblast001: i think bzr does not support editing them directly. you probably could use fast-export, edit the data and do a fast-import again | 20:27 |
| meoblast001 | yeah, with fast-export, how would i edit this | 20:27 |
| zsquareplusc | for the last commit you can also uncommit, but i guess you already know that | 20:28 |
| meoblast001 | yeah | 20:28 |
| zsquareplusc | fast-export generates a semi readable text file (XML? did not look at it). it should be editable with your favorite editor | 20:28 |
| meoblast001 | hexedit | 20:29 |
| meoblast001 | nothing else will really edit it | 20:29 |
| meoblast001 | well, at least Gedit can't open it | 20:29 |
| meoblast001 | it has binary | 20:29 |
| zsquareplusc | you write source code using a hex editor? wow ;-) | 20:29 |
| meoblast001 | no | 20:29 |
| zsquareplusc | oh | 20:29 |
| meoblast001 | perhaps Wine Notepad can open this | 20:30 |
| LarstiQ | you really don't want to do that | 20:31 |
| zsquareplusc | i can perfectly view the contents: bzr fast-export . |less | 20:31 |
| meoblast001 | it uses NT line braks? | 20:31 |
| meoblast001 | breaks* | 20:31 |
| LarstiQ | meoblast001: you could use `bzr uncommit` and commit again with a better message | 20:31 |
| zsquareplusc | its a simple line based protocol it seems | 20:31 |
| meoblast001 | LarstiQ: well, i used fast-import to remove a directory that shouldn't be in my project | 20:32 |
| meoblast001 | i wanted to remove all references to that directory from commit messages so people don't get confused | 20:32 |
| LarstiQ | meoblast001: using fast/ex/import should be fine | 20:32 |
| meoblast001 | well, people might get confused "where is this examples/ directory the commit message speaks of" | 20:33 |
| * LarstiQ thought you were trying to hexedit commit messages in a revision | 20:33 | |
| LarstiQ | meoblast001: how many revisions are we speaking about? | 20:33 |
| meoblast001 | well, i have 74 revisions in my project | 20:33 |
| meoblast001 | probably not a ton, but they would be scattered around | 20:33 |
| LarstiQ | and how deep down are these? | 20:33 |
| LarstiQ | ok | 20:33 |
| === kiko is now known as kiko-afk | ||
| meoblast001 | i found the commit messages in the bzr-export data | 20:34 |
| meoblast001 | should i just edit those there? | 20:34 |
| zsquareplusc | sure | 20:34 |
| meoblast001 | would Wine Notepad mess anything up? | 20:34 |
| zsquareplusc | you probably want to import the data in a fresh branch to check it out before you trash your original ;-) | 20:35 |
| meoblast001 | i know Windows Notepad on Windows computers i had to use a few times have had trouble reading files i wrote on my Ubuntu machine | 20:35 |
| zsquareplusc | notepad? what's this??? | 20:35 |
| LarstiQ | why would you use notepad? | 20:35 |
| meoblast001 | Wine Notepad because Gedit can't open files containing any binary | 20:35 |
| LarstiQ | I doubt that | 20:35 |
| zsquareplusc | try SciTe if you need a programmers editor thats small and simple :-) | 20:35 |
| meoblast001 | i get errors opening the output file | 20:35 |
| meoblast001 | ok | 20:36 |
| meoblast001 | i don't even use WINE anymore.. i don't know why i have it installed >.< | 20:36 |
| meoblast001 | zsquareplusc: turns out there's an integer saying how long these commit messages are | 20:44 |
| LarstiQ | meoblast001: isn't there something else to filter these streams? | 20:45 |
| LarstiQ | I'm pretty sure there is | 20:45 |
| zsquareplusc | ok. so you have to count the characters? some editors show how many characters you have selected in the status bar | 20:45 |
| meoblast001 | yes, for filtering | 20:45 |
| meoblast001 | not for directly editing | 20:45 |
| meoblast001 | hm i suppose i do :/ | 20:45 |
| zsquareplusc | heh, so there is your next project ;-) | 20:45 |
| zsquareplusc | fyi, the fast-import/export format is documented in the bzr wiki | 20:46 |
| LarstiQ | it comes from git land actually | 20:47 |
| LarstiQ | so there is more documentation/tools for it | 20:47 |
| zsquareplusc | yes i think the bzr wiki guides you there. however it also says something like "forward compatible" | 20:48 |
| meoblast001 | zsquareplusc: ok, what text editors count characters, i need one | 21:03 |
| meoblast001 | :O emacs probably does | 21:04 |
| meoblast001 | since emacs is insane | 21:04 |
| zsquareplusc | SciTE, at least with the settings i have counts them. vim with default settings should work too (if your brain is vim compatible ;-) | 21:05 |
| meoblast001 | zsquareplusc: i can't find that option | 21:06 |
| meoblast001 | zsquareplusc: by count characters i mean count the ones you have selected | 21:06 |
| zsquareplusc | sure | 21:06 |
| zsquareplusc | in SciTe? | 21:07 |
| meoblast001 | yup | 21:07 |
| LarstiQ | vim does | 21:09 |
| zsquareplusc | meoblast001: http://paste.ubuntu.com/277378/ put that in Sciteuser.properties (opened in options->open user config) | 21:10 |
| meoblast001 | i can't figure vim out | 21:10 |
| meoblast001 | thanks | 21:12 |
| meoblast001 | with the bzr fast-import filter, can i replace a particular file with another? | 21:56 |
| RenatoSilva | How to list all $revno - $commit_msg? | 22:01 |
| lifeless | moin | 22:07 |
| meoblast001 | bzr: ERROR: Bad restart - attempted to skip commit :47 but matching revision-id is unknown | 22:07 |
| meoblast001 | how do i fix that? | 22:07 |
| zsquareplusc | meoblast001: you probably need to run the fast import on a new, empty repo | 22:08 |
| meoblast001 | what do you mean? | 22:09 |
| meoblast001 | mkdir dir && cd dir/ && bzr init? | 22:09 |
| zsquareplusc | isn't it failing to import your edited fast export? | 22:09 |
| zsquareplusc | yes | 22:09 |
| meoblast001 | ok, that worked thanks | 22:12 |
| _habnabit | Is there a way to make bzr-svn remember the HTTP auth username/password used when connecting to a svn repository over HTTP? | 22:45 |
| mwhudson | _habnabit: i *think* that if you connect with svn and get it to remember the credentials, bzr-svn will use that | 22:46 |
| _habnabit | What do you mean by 'connect with svn'? | 22:47 |
| lifeless | do a svn operation | 22:47 |
| _habnabit | Yeah, I already tried that. | 22:47 |
| mwhudson | ah | 22:47 |
| _habnabit | I did a checkout and then an update and it didn't remember my credentials. | 22:47 |
| zsquareplusc | with the svn binary? | 22:48 |
| _habnabit | No, with bzr. | 22:48 |
| _habnabit | I did 'bzr checkout https://example.com' and then 'bzr up' | 22:48 |
| lifeless | _habnabit: do one with svn itself | 22:48 |
| _habnabit | Okay. | 22:49 |
| _habnabit | Oh hm. | 22:51 |
| _habnabit | 'svn co https://habnabit@example.com/' isn't using 'habnabit' as my username. | 22:52 |
| _habnabit | Never mind, I forgot about --username. | 22:52 |
| _habnabit | And nope, it's still asking me for my username and password. | 22:53 |
| _habnabit | I checked out the repository over svn and I can 'svn up | 22:54 |
| _habnabit | ' without entering it, but bzr doesn't recognize it. | 22:54 |
| meoblast | hi | 23:02 |
| meoblast | with bzr fast import, can i replace 1 particular text string with another? | 23:02 |
| spiv | Good morning. | 23:06 |
| meoblast | ugh | 23:09 |
| meoblast | doing this manually is going to be a PITA | 23:09 |
| meoblast | is there a bazaar plugin for replacing a particular string with another in every commit | 23:11 |
| meoblast | if anyone knows of any plugins that do that, please tell me, i'll be up all night manually editing this fast-import file | 23:27 |
| lifeless | 'sed' ? | 23:28 |
| meoblast | no, won't work | 23:28 |
| meoblast | there's a "data" line | 23:28 |
| meoblast | and it says how many bytes are in the proceeding data | 23:28 |
| meoblast | i have to edit all those fields manually | 23:29 |
| meoblast | lifeless: know of anything that can automate this process for me? | 23:30 |
| meoblast | lifeless: thousands of lines i'm going through :( | 23:33 |
| lifeless | meoblast: git has some filter scripts for fast import streams | 23:37 |
| meoblast | i don't think i can handle this any longer | 23:37 |
| meoblast | i'm 9000 lines into the file and can't take it anymore | 23:37 |
| meoblast | this is taking forever | 23:37 |
| meoblast | lifeless: someone in #git told me that git doesn't actually take the same streams as bazaar | 23:44 |
| meoblast | now i understand why Linus Torvalds was using tarballs and patches | 23:44 |
| lifeless | meoblast: they are lying :) | 23:46 |
| lifeless | bzr's fast-import/fast-export use the common fast import format created by git | 23:47 |
| lifeless | igc is discussing various extensions to improve the format, but its not a bzr invention | 23:47 |
| james_w | meoblast: there is "bzr fast-import-filter" or similar isn't there? | 23:49 |
| james_w | not sure it can do that operation though | 23:49 |
| meoblast | yes there is | 23:49 |
| meoblast | but i can't find anything on filtering the actual contents of source files | 23:50 |
| Ng | how do I remove a tag from a remote branch? (a bzr+ssh branch on bazaar.lp.net) | 23:57 |
| Ng | I removed the tag locally and pushed some changes, then retagged locally and now when I push it tells me the tag conflicts | 23:57 |
| spiv | Ng: push --overwrite | 23:58 |
| Ng | aha :) | 23:59 |
Generated by irclog2html.py 2.7 by Marius Gedminas - find it at mg.pov.lt!