| igc | morning all | 00:01 |
|---|---|---|
| igc | hi garyvdm, jml | 00:01 |
| garyvdm | Hi igc | 00:01 |
| jml | igc: g'day | 00:01 |
| thumper | nightly ppa is broken for bzrtools again | 00:02 |
| thumper | bzr claims 1.17dev | 00:02 |
| thumper | but package says 1.15ish | 00:02 |
| thumper | and bzrtools from the ppa doesn't like 1.17 yet | 00:02 |
| jml | thumper: yeah, I was going to ping you about that. | 00:03 |
| thumper | jml: why ping me? I don't do anything with the ppa | 00:04 |
| jml | thumper: just in reference to our earlier conversation, is all. | 00:04 |
| jml | istr it's either statik or james_w who maintains the ppa. | 00:04 |
| thumper | I think it is james_w given the uploader :) | 00:04 |
| james_w | aye | 00:05 |
| thumper | james_w: is bzr.dev packaged as 1.16 or 1.17... ? | 00:05 |
| james_w | bzr.dev is packaged as 1.15+ currently | 00:06 |
| james_w | which is an oversight | 00:06 |
| james_w | man, those tooltips on the branch listings are pretty irritating | 00:08 |
| === afk is now known as mthaddon | ||
| lifeless | jml: so, when do you want to get together for EP stuff? | 00:09 |
| lifeless | jml: any afternoon this week would be good for me | 00:09 |
| jml | lifeless: tomorrow is best for me. | 00:30 |
| jml | lifeless: what time is good? | 00:30 |
| jml | lifeless: also, wrt preserving NEWS headings -- I'm not 100% clear on what you mean. | 00:31 |
| jml | lifeless: when I get clear, I'll be happy to patch the releasing guide. | 00:31 |
| lifeless | jml: there are a number of headings like INTERNAL | 00:32 |
| lifeless | they should exist, with no entries, under IN DEVELOPMENT | 00:32 |
| jml | ahh ok | 00:33 |
| lifeless | jml: tomorrow is fine | 00:33 |
| lifeless | say after lunch? 1ish? | 00:33 |
| jml | so when adding the IN DEVELOPMENT section back in, when merging the release branch back, the RM should also add in the empty headings? | 00:33 |
| lifeless | yes | 00:33 |
| jml | cool. | 00:33 |
| lifeless | otherwise devs add the randomly | 00:34 |
| lifeless | and we get order changes and conflicts and spurious new section names | 00:34 |
| jml | that's easy enough. | 00:34 |
| lifeless | yup :) | 00:35 |
| jml | lifeless: 1ish is good. | 00:35 |
| igc | bbl | 00:38 |
| bialix | garyvdm: hi | 00:46 |
| garyvdm | Hi bialix | 00:47 |
| garyvdm | You are up early/late | 00:47 |
| bialix | I have a question about Diff button in qlog when there is ext diff configured | 00:47 |
| garyvdm | ok | 00:47 |
| bialix | late | 00:47 |
| garyvdm | Same :-) | 00:48 |
| bialix | in Windows I see small button with triangle on it | 00:48 |
| bialix | how you created it? | 00:48 |
| garyvdm | Call button.setMenu | 00:49 |
| garyvdm | see lib/diff.py line 118 | 00:49 |
| bialix | that's all? | 00:49 |
| garyvdm | Yes | 00:49 |
| bialix | yeah, I found this code | 00:50 |
| bialix | and it's the same on Linux? | 00:50 |
| garyvdm | Yes :-) | 00:50 |
| bialix | nice | 00:50 |
| bialix | I'm tinking about improving our Browse... button for selecting branch or merge directive | 00:50 |
| garyvdm | allthough - it is not a narrow button when using the gtk style :-( | 00:50 |
| bialix | I want to use the same approach | 00:51 |
| bialix | how bad it in gtk? | 00:51 |
| garyvdm | screenshot comming... | 00:51 |
| * bialix waiting | 00:51 | |
| bialix | btw, what you think about adding simple support for gathering list of available branches on code page of project at lp? | 00:52 |
| bialix | I've played with urllib2 and I think we can grab lp:urls from code page | 00:53 |
| garyvdm | it use to look like this: http://garyvdm.googlepages.com/qlog.png | 00:54 |
| garyvdm | now it looks like : .... | 00:54 |
| garyvdm | busy uploading. | 00:55 |
| poolie | garyvdm: you might like to look at python-launchpadlib too | 00:55 |
| poolie | it's kind of poorly documented | 00:55 |
| bialix | there is no pastebin for images, is it? | 00:55 |
| poolie | but it lets you poke through basically the whole data model of launcphad | 00:56 |
| poolie | hello btw | 00:56 |
| bialix | hi poolie | 00:56 |
| dash | bialix: imgur.com maybe | 00:56 |
| garyvdm | bialix: my internet is just bad... | 00:56 |
| bialix | crop just button from image | 00:56 |
| garyvdm | dash: i'll try that | 00:56 |
| bialix | to make image small | 00:56 |
| poolie | lifeless, spiv, all, i'm going to close my mail client soon... | 00:57 |
| garyvdm | http://imgur.com/HBbWZ | 00:57 |
| garyvdm | imgur is cool dash | 00:57 |
| poolie | so i'm looking for (a) moral support (b) pointers to anything you think i really must reply to | 00:57 |
| garyvdm | bialix: basically the button is too wide. | 00:58 |
| bialix | yep | 00:58 |
| bialix | maybe explicit width settings will help? | 00:59 |
| garyvdm | Yes - just have not really looked at it. | 00:59 |
| bialix | poolie: launchpadlib has too much dependencies | 00:59 |
| poolie | simplejson, wadllib, httplib2? | 01:00 |
| bialix | +lazr.ui + oath | 01:00 |
| lifeless | poolie: +1 :) | 01:00 |
| bialix | + don't know what elase | 01:01 |
| poolie | jml, could you run "bzr info http://bazaar.launchpad.net/~mbp/bzr/doc/" | 01:01 |
| garyvdm | bialix: I've been think about qmain a bit, bit have been coding the tree widget refactoring mostly. I've made some good progress tonight. | 01:01 |
| lifeless | poolie: uhm, nothing offhand that is critical | 01:01 |
| poolie | i get a weird message about redirection | 01:01 |
| bialix | garyvdm: I'm using Ian's bzr explorer, it' nice | 01:01 |
| poolie | me too | 01:01 |
| spiv | poolie: same, nothing I can think of needing your attention now. | 01:02 |
| bialix | garyvdm: will be nice to have there your tree widget though | 01:02 |
| bialix | garyvdm: why it has segfaulted? | 01:02 |
| garyvdm | In parent() i was returning a valid index for the root - it should be an invalid index. | 01:03 |
| spiv | poolie: perhaps try --no-plugins? ISTR a bug report about weird redirections that turned out to be due to bzr-svn | 01:03 |
| bialix | ah, ok | 01:03 |
| bialix | garyvdm: I hope you will place folders at top, as in qbrowse | 01:04 |
| bialix | garyvdm: this is most often used sort order for explorer-like tools | 01:04 |
| garyvdm | Yes - and later be-able to control that by being able to click on the headings | 01:05 |
| bialix | as you wish | 01:05 |
| bialix | we need to show unknown/ignored there too, do we? | 01:06 |
| garyvdm | Low priority at the moment. | 01:06 |
| garyvdm | Yes | 01:06 |
| garyvdm | If you are browsing a working tree. | 01:06 |
| bialix | and maybe have ability to filter items by status all/versioned/modified/unknown/ignored | 01:06 |
| garyvdm | yes - one widget to do all of that | 01:07 |
| garyvdm | I've got my work cut out :-) | 01:07 |
| bialix | cool | 01:07 |
| garyvdm | QSortFilterProxyModel will be my friend for that. | 01:07 |
| bialix | ah | 01:08 |
| bialix | nice | 01:08 |
| garyvdm | With special performances cases for workingtree unknown/ignored I assume. | 01:08 |
| bialix | garyvdm: I've made attempt to look into QtTest lib (for testing Qt GUI). | 01:08 |
| bialix | it's rather limited | 01:09 |
| garyvdm | I don't think we need a silver bullet for test. | 01:09 |
| bialix | re test: may be it makes sense to think how to separate GUI and logic/model | 01:09 |
| bialix | so we can test logic/model easily | 01:10 |
| bialix | QtTest is not even a bullet, IMO | 01:10 |
| garyvdm | Yes thats way I started on tests for LogGraphProvider. | 01:10 |
| jml | poolie: http://paste.ubuntu.com/196702/ | 01:11 |
| bialix | IIRC, there was desire to move it into bzrlib core? | 01:11 |
| garyvdm | Yes | 01:12 |
| garyvdm | It would be nice for bzr-gtk to reuse LogGraphProvider, but It would require alot of effort. | 01:13 |
| garyvdm | Maybe I'll do it .... | 01:14 |
| garyvdm | ... when I run out of things to do on qbzr | 01:14 |
| bialix | ha ha | 01:14 |
| bialix | garyvdm: can you add this at line 117 in diff.py: self.menu_button.setFixedWidth(24) | 01:18 |
| bialix | and check if in gtk style it's better now? | 01:19 |
| bialix | width could be ~20 | 01:19 |
| garyvdm | Yes - it does look better | 01:20 |
| garyvdm | but we need to make the width dynamic | 01:20 |
| garyvdm | Maybe guess it as 1/2 the height? | 01:20 |
| bialix | or maybe play wit Size Policy | 01:21 |
| bialix | with | 01:21 |
| garyvdm | ok | 01:21 |
| bialix | 1/2 is ok for me | 01:21 |
| bialix | it seems I need to get some sleep. | 01:23 |
| * bialix ~ | 01:24 | |
| RainCT | Hi | 01:28 |
| RAOF | Howdie. | 01:29 |
| RainCT | I think no, but just to be sure, does bzr have something like "git branch"/"git checkout" (ie, several branches in the same directory)? | 01:29 |
| Peng_ | RainCT: No. There's some work-in-progress stuff. Co-located branches or something. | 01:29 |
| RainCT | And like "git format-patch" neither, right? | 01:30 |
| RAOF | bzr send | 01:31 |
| jelmer | hey RainCT | 01:31 |
| RAOF | And looms can work for some of the use-cases of multiple branches in the same directory. | 01:31 |
| RainCT | jelmer: hey :) | 01:32 |
| lifeless | as can a shared treeless repo | 01:32 |
| lifeless | hi jelmer | 01:32 |
| lifeless | jelmer: does tdb allow repeated keys? | 01:32 |
| jelmer | lifeless: hi | 01:33 |
| RAOF | Shared, treeless repo + checkout working tree is about it, just a bit more fiddly :) | 01:33 |
| jelmer | lifeless: nope | 01:33 |
| sensae | Hello | 01:38 |
| === Kissaki is now known as Kissaki^0ff | ||
| sensae | How can I disable interactive login via ssh while allowing bzr commands through bzr+ssh? | 01:55 |
| lifeless | man 5 authorized_keys documents it | 01:59 |
| lifeless | under the AUTHORIZED_KEYS FILE FORMAT heading | 01:59 |
| sensae | lifeless: Sorry, I believe I asked my question poorly. I shouldn't have said interactive - I didn't mean password-based login. I meant disabling any login that will spawn a shell. Launchpad seems to do something similar - if I try to ssh, it kicks me out with "No login shells.", but I can still run bzr+ssh commands. | 02:03 |
| sensae | I'm trying to mirror that behavior on my own system. | 02:04 |
| lifeless | sensae: I answered what you intended to ask | 02:04 |
| lifeless | I wasn't talking about password vs non-password | 02:04 |
| sensae | Ah, I see it further down. Thanks. | 02:09 |
| mib_t7vnj1 | Is it possible to change a commit author on a commit? | 02:19 |
| lifeless | no; you can uncommit it and commit it again with a diferent author. | 02:19 |
| mib_t7vnj1 | Oh my | 02:20 |
| krisfremen | umm, i just moved my branch from a linux box to a windows box, using cygwin, and i can't get diff to work | 02:20 |
| krisfremen | everything else seems to work, except the diffs | 02:21 |
| lifeless | krisfremen: does bzr status work? | 02:22 |
| krisfremen | yes | 02:23 |
| lifeless | what does diff seem to be doing wrong? | 02:24 |
| krisfremen | it doesn't print anything | 02:24 |
| krisfremen | bzr just exits and doesn't print anything at all | 02:24 |
| lifeless | is there anything in the bzr.log | 02:25 |
| lifeless | you can get the path for that from 'bzr --version' | 02:25 |
| krisfremen | 1.666 return code 0 | 02:26 |
| lifeless | it thinks there are no differences | 02:27 |
| krisfremen | http://pastebin.com/d69f6f59c | 02:28 |
| krisfremen | but i just made a commit | 02:28 |
| lifeless | well it wouldn't expect any changes after a commit | 02:28 |
| sensae | lifeless: Do you know what option would give me the desired effect? | 02:38 |
| lifeless | sensae: command=bzr serve --allow-writes | 02:39 |
| lifeless | sensae: or something like that | 02:39 |
| lifeless | I don't remember the exact command line | 02:39 |
| poolie | thanks for the tip spiv, you're probably right | 02:40 |
| poolie | yes, you were right | 02:53 |
| poolie | i think it's fixed in a later release of bzr-svn | 02:53 |
| sensae | lifeless: At this point, I'm stumped. Googling found "command="bzr serve --allow-writes --inet --directory=/"", and I'm having no luck. | 02:54 |
| spiv | sensae: bzr asks ssh to run "bzr serve --inet --directory=/ --allow-writes", FWIW. | 02:59 |
| spiv | sensae: see also contrib/bzr_ssh_path_limiter in the bzr source tree | 03:00 |
| sensae | spiv: No dice with that either. I've tried a lot of different commands, I'm just getting "Please check connectivity and permissions" | 03:00 |
| sensae | Alright, I'll take a look | 03:01 |
| spiv | sensae: maybe you need to specify command="/usr/bin/bzr ...", or something like that? | 03:01 |
| spiv | sensae: $PATH might not be set how you expect at that point, because no .bashrc or whatever would have been run. | 03:02 |
| sensae | spiv: No luck with that either :/ | 03:03 |
| spiv | where is bzr installed on your system? | 03:03 |
| spiv | (on the remote system you are trying to configure) | 03:03 |
| wgrant | spiv: .bashrc should be run, actually. That's a common vulnerability. | 03:03 |
| sensae | spiv: /usr/bin/bzr , I verified with a whereis | 03:03 |
| spiv | wgrant: oh really? wacky! | 03:03 |
| spiv | sensae: *nod* | 03:03 |
| wgrant | spiv: Yep - it runs the command in a shell. | 03:04 |
| sensae | spiv: Hm. This path limiter seems useful anyway, guess I'll try using it and see where it gets me. | 03:05 |
| sensae | spiv: ..and it got me nowhere. | 03:09 |
| spiv | sensae: yeah, I'd expect it to have the same issue you were already having, although I don't know what that could be. | 03:12 |
| poolie | lifeless: why is bug 387555 a bug? | 03:12 |
| ubottu | Launchpad bug 387555 in bzr "aliases can override main command names now" [Critical,Triaged] https://launchpad.net/bugs/387555 | 03:12 |
| spiv | sensae: perhaps check ~/.bzr.log on the remote side, and also try "ssh -vvv user@host" directly. | 03:13 |
| lifeless | poolie: I'm not entirely convinced that it is. However Aaron reported the change in behaviour, and I'll comment further once I look at it. | 03:14 |
| lifeless | poolie: if it *is* a bug it will bit people badly in the next release unfixed, by making 'bzr shelve' run the wrong shelve. | 03:14 |
| mwhudson | poolie: that bug doesn't mean by 'alias' what i first thought when i read the summary | 03:14 |
| garyvdm | Updating branch... Launchpad is processing new changes to this branch and will be available in a few minutes. Reload to see the changes. | 03:15 |
| sensae | spiv: Hm, log doesn't exist for the user I'm trying this as | 03:15 |
| garyvdm | Very cool! | 03:15 |
| spiv | sensae: ok, so bzr almost certainly isn't getting run. | 03:16 |
| spiv | sensae: maybe try using a really simple command, like 'command="/bin/echo hello" ssh-rss ...' as a sanity check? | 03:19 |
| mwhudson | beuno, rockstar, Peng_: have any of you looked at https://code.edge.launchpad.net/~zigarn/loggerhead/nested-branches/+merge/7307 ? | 03:20 |
| rockstar | mwhudson, nope, I hadn't. | 03:20 |
| mwhudson | i don't think i want to merge it | 03:20 |
| mwhudson | but i guess i should think of some reasons other than a gut feeling | 03:21 |
| poolie | lifeless: the guide for upgrading to 2a seems reasonable | 03:21 |
| poolie | you could run it past some lp people too... | 03:21 |
| sensae | spiv: Debug messages say "forcing command: /bin/echo hello" but without the debug flags, I get nothing. | 03:22 |
| Peng_ | mwhudson: I haven't. It sounded complex, so I didn't even try. :D | 03:24 |
| lifeless | thumper: jml: mwhudson: any comments on my draft for upgrading repositories across the rich root barrier? | 03:24 |
| Peng_ | Hey, look over there! *points* | 03:25 |
| * Peng_ sticks bug #382765 on someone's back. | 03:25 | |
| ubottu | Launchpad bug 382765 in loggerhead "history.py uses deprecated (and deleted) ProgressBarStack" [Critical,Triaged] https://launchpad.net/bugs/382765 | 03:25 |
| spiv | sensae: weird. | 03:27 |
| jml | lifeless: I have been meaning to look at it for 1.5 days now, but have not had the opportunity. | 03:27 |
| sensae | spiv: Fixed it, and I feel pretty stupid now. My test user's shell was set to /bin/false in /etc/passwd :/ Works as expected now. | 03:28 |
| spiv | sensae: ah! | 03:28 |
| spiv | sensae: glad it's working for you | 03:28 |
| sensae | spiv: Thanks for all the help, I think without it I would have given up. | 03:28 |
| spiv | sensae: not a problem :) | 03:35 |
| RenatoSilva | Do tags always tag the whole branch or is it possible to tag sub-directories or single files? | 03:40 |
| lifeless | tags tag commits | 03:40 |
| lifeless | so 'whole thing' | 03:40 |
| RenatoSilva | oh, then so | 03:40 |
| RenatoSilva | then no | 03:40 |
| RenatoSilva | I have a problem | 03:40 |
| RenatoSilva | myutils = Branch(); myutils.add(one_util_v1.2); myutils.add(another_util_v5.9) | 03:42 |
| wgrant | RenatoSilva: This is part of why we suggested that you use separate branches. | 03:42 |
| RenatoSilva | I'd have to tag myutils, but I would like to tag each file | 03:42 |
| RenatoSilva | wgrant: I see | 03:43 |
| RenatoSilva | wgrant: but I'll need to set up one dir for each file right? | 03:43 |
| wgrant | RenatoSilva: Yes. | 03:43 |
| RenatoSilva | can the same .bzr dir store multiple branches? | 03:43 |
| wgrant | That's complicated. | 03:44 |
| RenatoSilva | yeah, the whole issue is | 03:45 |
| sensae | Now I just have to figure out why bzr is crashing on a push. x.x | 03:45 |
| RenatoSilva | wgrant: I think that cvs allows to tag any tree | 03:47 |
| spiv | RenatoSilva: Launchpad only stores single branches. | 03:47 |
| lifeless | RenatoSilva: bzr|hg|git != CVS | 03:47 |
| wgrant | RenatoSilva: Yes, but CVS is veeeeery different from Bazaar. | 03:47 |
| lifeless | RenatoSilva: few patterns that work well in CVS work well in any of the modern version control systems. | 03:47 |
| RenatoSilva | wgrant: it would be nice maybe if we could have 'contextual' tags, they would not tag full commits but commits on a target sub-dir or file | 03:48 |
| wgrant | RenatoSilva: Why? | 03:49 |
| RAOF | Is there any way with bzr-git to push to/pull from a non-master branch? | 03:49 |
| mwhudson | RAOF: not yet, no | 03:49 |
| mwhudson | RAOF: i think you can git-import which will get you a repo containing all branches | 03:50 |
| lifeless | RenatoSilva: are you tagging releases? | 03:50 |
| RAOF | mwhudson: But you can't push to a non-master branch. OK. | 03:50 |
| mwhudson | RAOF: afaik | 03:50 |
| RenatoSilva | wgrant: so that I create myutils and global tags like Release_1.0, Release_1.1 etc... but could also have independent release tags with the 'contextual' tags: myutils/util_one --> Release_5.6, etc... | 03:51 |
| lifeless | RenatoSilva: again, it sounds like you want to treat these files as separate things | 03:52 |
| wgrant | RenatoSilva: You're not meant to colocate lots of separate pieces of software in one branch. | 03:52 |
| lifeless | RenatoSilva: separate things should be in separate branches if you want to put metadata like that | 03:52 |
| wgrant | It's not like Subversion, where you throw hundreds and hundreds of projects into one repository. | 03:52 |
| RenatoSilva | lifeless: the contextual tags would be just for reference / browsing, to track the history of a subdir or file | 03:53 |
| RenatoSilva | lifeless: If I separate the things, I would need one directory for each file | 03:53 |
| RenatoSilva | to create a branch | 03:53 |
| lifeless | RenatoSilva: I must admit I don't really see the benefit of tagging only part of a tree | 03:53 |
| AfC | wgrant: I tried bzr-svn branching a small project out of Apache's Subversion repo... only to discover they had >700,000 revisions there. I decided not to wait :| | 03:54 |
| wgrant | AfC: Yep... Zope does it too. | 03:54 |
| mwhudson | AfC: svn.apache.org really hate launchpad :) | 03:54 |
| AfC | mwhudson: I bet | 03:54 |
| mwhudson | at one point all of canonical's ip addresses were banned even | 03:54 |
| AfC | mwhudson: last year when I was trying to get gtk+ out of svn.gnome.org, it took ~30 minutes to get 100 revisions. Subversion performs *horribly* when asked for historical editions of files. | 03:55 |
| AfC | Apache really is in its own little world | 03:55 |
| RenatoSilva | lifeless: let's say you have a myutils branch, with tags R10, R11 R12 and you have the specific_abc_utility wich has it's own versioning like 9.04, 9.10 etc. If you could do something like $bzr tag R9.04 -d abc_utility.py, then you could later take a look at that particular revision of that file, using something like $bzr tags -d abc_utility.py. | 03:59 |
| wgrant | RenatoSilva: You don't have that sort of branch, though. | 03:59 |
| lifeless | RenatoSilva: yes; OTOH you will have a horribly confusing set of tags | 04:00 |
| lifeless | or you'll have to run commands to query 'all tags' specfically | 04:01 |
| RenatoSilva | it's like eclipse, galileo is eclipse 3.5, this is the main line of versioning, but every sub-project has its own different versioning | 04:01 |
| lifeless | we put sub projects into different branches | 04:01 |
| lifeless | it makes it clear | 04:01 |
| lifeless | not that I'd hold eclipse up as a paragon of clarity for its module and versioning system | 04:02 |
| RenatoSilva | lifeless: not confusing maybe, they could be separate tags, contextual tags, they would appear only if you ask to, like $bzr tags --include-contextual or so | 04:03 |
| wgrant | That is confusing... | 04:03 |
| lifeless | that is itself confusing | 04:03 |
| RenatoSilva | :) | 04:03 |
| RenatoSilva | it would continue to work the same way, only people who noticed such issue would be interested about it... | 04:04 |
| wgrant | Assuming that you weren't terrified of having an extra directory segment, what is the benefit? | 04:05 |
| lifeless | RenatoSilva: it would have significant knockon effects: firstly when saying to a user 'get version X' the user would need to know that there are invisible tags they need to supply a magic path to see. | 04:06 |
| lifeless | secondly, the data storage model would be made more complex. We'd have to write code to support it in the CLI, web UI, gtk/qt interfaces and more. | 04:06 |
| lifeless | What I'm saying is that there is a signficant, measurable cost in doing what you propose. | 04:07 |
| lifeless | So we should get a greater benefit by doing it than it costs, or it is likely not worth doing. | 04:07 |
| lifeless | (we) is the users+developers of bzr combined. | 04:07 |
| RenatoSilva | lifeless: I don't get your 1st point | 04:09 |
| lifeless | at the moment, if I say, version 10.6, there are two ways, and only two, to get it. A branch called 10.6, or a tag in trunk called 10.6 | 04:09 |
| lifeless | your proposal adds a third way | 04:09 |
| lifeless | a tag in trunk that 'bzr tags' *does not list* called 10.6 | 04:10 |
| RenatoSilva | it should not list if it's not a branch tag (a contextual tag) | 04:10 |
| RenatoSilva | when you do bzr tags, you're doing it under the branch | 04:11 |
| lifeless | the point is about the cognitive overhead of learning yet another way to categorise things | 04:11 |
| RenatoSilva | only if you ask so, it would operate under a subset | 04:11 |
| lifeless | now, I'll agree that we may have gone too far with whole-tree versioning; I've made that argument myself from time to time. | 04:11 |
| lifeless | but we need to accurately measure and assess the costs of thingslike this, not just assert that they are worth doing. | 04:12 |
| RenatoSilva | lifeless: you mean each dir could be a branch? | 04:12 |
| lifeless | with the nested trees feature that is being finished at the moment, yes they can be | 04:13 |
| RenatoSilva | just like cvs modules | 04:13 |
| lifeless | not at all. Like a small subset of cvs modules perhaps. | 04:13 |
| lifeless | cvs modules are actually far more complex than most users think they are. | 04:14 |
| lifeless | [complex and problematic] | 04:14 |
| RenatoSilva | if you have a cvs repo in front of you, a big tree, and you wonder: "well where are the modules/branches/projects"? The answer is: your project can be anything you want, because each dir is a cvs module (ok, there's no atomic commit but I guess svn works this way) | 04:15 |
| lifeless | svn works differently again | 04:15 |
| RenatoSilva | wouldn't branch inside branches be a complicated stuff? more than the sub-tags? | 04:16 |
| lifeless | it is complicated but it has very significant benefits | 04:16 |
| lifeless | it lets you do things you can't do without | 04:16 |
| RenatoSilva | it would let you have sub-tags right? | 04:17 |
| lifeless | not unless you split your project up into nested projects | 04:17 |
| RenatoSilva | I wonder how git adresses all this | 04:18 |
| RenatoSilva | and hg | 04:18 |
| AfC | RenatoSilva: You might find that 3rd generation distributed revision control has different ("best") practises than perhaps you are used to. You might just want to give things a try the way they work well in [in this case, Bazaar] and see how you get on. | 04:18 |
| lifeless | git and hg do exactly what bzr does | 04:18 |
| RenatoSilva | AfC: in my example it means one dir for each single file | 04:19 |
| AfC | Because they are also 3rd generation distributed version control systems :) | 04:19 |
| lifeless | there are some minor spelling differences, but at the level this discussion is at they are identical. | 04:19 |
| RenatoSilva | AfC: which is a bit annoying | 04:19 |
| AfC | RenatoSilva: {shrug} ... whether one file or one hundred, if the branches have separate identities, so be it. | 04:19 |
| lifeless | RenatoSilva: so you have a choice. You can either: use CVS. Use one branch per file. Tag releases for all files at once. | 04:20 |
| RenatoSilva | calm donw guys | 04:20 |
| RenatoSilva | I'm jsut talking about it | 04:20 |
| lifeless | RenatoSilva: there is an inconsistency in what you are asking: you're saying you have files that are sufficiently well managed that they get individual releases, but you aren't willing to pay the [tiny] cost of having a separate branch to achieve that management. | 04:21 |
| RenatoSilva | lifeless: because they's just single files, it could be together in one single dir, I think it's annoying one dir + .zr for just one file, repeated several times. Just my opinion. As you said the choice is mine. I'm just trying to know how it works | 04:23 |
| AfC | lifeless: incidentally, I would value your comment or contribution on the email thread on bazaar-list titled "I pulled HOW much?". I suspect I have observed a similar behaviour, and am curious if indeed there is a quick "fix" (sic). | 04:25 |
| Peng_ | AfC: The second reply *did* say there's a patch up. | 04:25 |
| Peng_ | AfC: (And it works, too.) | 04:25 |
| AfC | Peng_: yes. No kidding. | 04:25 |
| AfC | Peng_: but as John went to quite some trouble to suggest that perhaps his implementation needed consideration, I thought I would see if Robert had anything to say on the topic. | 04:26 |
| Peng_ | AfC: Okie dokie. | 04:26 |
| RenatoSilva | (!) how about if I apply a tag like Utility_ABC_Release_10 in the branch? | 04:26 |
| Peng_ | (Okey dokey? I dunno.) | 04:26 |
| lifeless | AfC: I'll have a look | 04:29 |
| lifeless | RenatoSilva: if that works for you, great. | 04:30 |
| sensae | Urgh, anybody have a solution for making bazaar create files with a group permission of 7, without using umask on every dev account? :/ | 04:30 |
| AfC | Peng_: it's one of those things you hear spoken (by American presidents and other illiterate peasants). I don't think you'd ever see it written down, except maybe in a movie script. | 04:30 |
| lifeless | sensae: you can set it in /etc/ssh/rc I think | 04:30 |
| lifeless | sensae: or something like that | 04:30 |
| spiv | AfC: I believe the branch jam linked to fixes it; I'm actually reviewing that code atm. | 04:30 |
| spiv | AfC: (I spent some time at UDS discussing and pairing on that issue with jam) | 04:31 |
| RenatoSilva | lifeless: real example: http://bazaar.launchpad.net/~renatosilva/+junk/utilities.ruby/files | 04:31 |
| RenatoSilva | the branch itself is not versioned, but some files inside it | 04:31 |
| RenatoSilva | currently it's revision 1, but take a look at: | 04:32 |
| lifeless | RenatoSilva: branches can't be versioned in bzr. | 04:32 |
| RenatoSilva | http://bazaar.launchpad.net/~renatosilva/%2Bjunk/utilities.ruby/annotate/head%3A/trf.rb | 04:33 |
| RenatoSilva | inside the file it stands it's the version 2009.4.22, the same way for the other files | 04:33 |
| RenatoSilva | so my idea is to $bzr tag trf_2009.4.22 and $bzr tag ganyclean_2009.2.28 | 04:35 |
| spiv | RenatoSilva: if you want to manage that file as its own independent entity, make a separate branch for just that file. Really :) | 04:35 |
| RenatoSilva | I think it would replace the sub-tags nicely | 04:35 |
| lifeless | RenatoSilva: you can do that. can I ask.. what do you want the tags for anyway? | 04:36 |
| spiv | RenatoSilva: I'm not sure why that wouldn't work well for you? | 04:36 |
| lifeless | spiv: cognitive overhead I think. | 04:36 |
| RenatoSilva | lifeless: to find previous _release_ versions of the files | 04:36 |
| lifeless | RenatoSilva: 'bzr log filename' can report on that for you. | 04:36 |
| Peng_ | I just realized I accidentally disabled all plugins in Loggerhead. Maybe that's why it stopped leaking memory. | 04:37 |
| Peng_ | (or, well, gaining memory at least.) | 04:37 |
| lifeless | RenatoSilva: if when you are doing a release you say 'release 2009.2.28' in your commit message for the file. | 04:37 |
| RenatoSilva | lifeless: I mean _release_ tags, not raw revisions | 04:37 |
| lifeless | RenatoSilva: yes, I know what you mean. But for individual files it seems like they *have* to change when you do a per file release. | 04:38 |
| lifeless | so I don't see why tags are preferrable. | 04:38 |
| RenatoSilva | lifeless: oh I see, put that in the commit comment is another option, altough I don't know which one is better | 04:38 |
| lifeless | the way people generally manage releases with bzr is to run 'bzr branch trunk RELEASE-X' | 04:38 |
| RenatoSilva | I think search in the tags could be easier than searching in the comments | 04:40 |
| RenatoSilva | the comments would better explain the changes, I think tag is better for tagging such commit as "this is release x or y" | 04:40 |
| lifeless | RenatoSilva: 'bzr log -m release FILENAME' | 04:40 |
| RenatoSilva | lifeless: ok | 04:41 |
| RenatoSilva | I have to read more on bzr (more than those 5 minutes :) ) | 04:41 |
| * spiv -> lunch | 04:41 | |
| RenatoSilva | but I'm pretty happy because I can do the basics and I will solve a problem at work | 04:42 |
| RenatoSilva | I have a project at work versioned with CVS, but I change it at home too (and can't commit to work). I will solve this by using bzr... | 04:44 |
| lifeless | good luck, I hope it works smoothly for that | 04:45 |
| sensae | lifeless: I need a little more push in the right direction than just what file :p How would I go about it? | 04:45 |
| RenatoSilva | thank you guys for helping | 04:46 |
| lifeless | as per man 5 authorized_keys: | 04:46 |
| lifeless | If ~/.ssh/rc exists, runs it; else if /etc/ssh/sshrc exists, runs it; o... | 04:46 |
| lifeless | so you can put commands to set umask etc in those scripts | 04:47 |
| sensae | So you'd recommend setting the umask for devs as a fix? | 04:47 |
| lifeless | that + sticky bit is the easiest way to ensure consistent permissions in a unix server | 04:48 |
| sensae | lifeless: Alright, thanks. That's what I was looking for - an opinion of the best way to go about it :) | 04:49 |
| RenatoSilva | why would I want QBzrEclipse rather than the non-Q? | 04:53 |
| RenatoSilva | What does Qt has with Eclipse? It has its own gui in SWT, I couldn't understand really | 04:54 |
| RenatoSilva | RenatoSilva: The bzr-eclipse plugin uses SWT for its interface whereas this plugin uses the QBzr plug-in. This does mean that the interface may not have the same look and feel as Eclipse does. The advantage of this approach though is that you get a consistent graphical user interface to Bazaar whether you are using the command line, TortoiseBzr or Eclipse. The QBzr plugin also provides a very nice interface for Bazaar. | 04:54 |
| AfC | spiv: nice. | 05:00 |
| AfC | spiv: [I hope you guys can land that before 1.16] | 05:00 |
| RenatoSilva | I I write an utility for eclipse, would it be suitable to link the branch with eclipse project? | 05:00 |
| RenatoSilva | Or should the branches be direct work on the project, patch proposals? | 05:01 |
| wgrant | RenatoSilva: It wouldn't be suitable to have on the eclipse project. | 05:13 |
| wgrant | As it's not a branch of the eclipse project. | 05:13 |
| wgrant | All of a project's branches should ideally have a common ancestor. | 05:14 |
| lifeless | wgrant: I think thats a misconception | 05:15 |
| lifeless | wgrant: lp is overly strict with its divisions in this area | 05:15 |
| wgrant | lifeless: It's not strict at all... | 05:16 |
| wgrant | lifeless: What do you mean? | 05:16 |
| lifeless | wgrant: needing a separate project to deal with code that is for the same project but organised into different trees | 05:16 |
| wgrant | lifeless: But a utility for Eclipse is not code for the Eclipse project. | 05:17 |
| === mthaddon is now known as afk | ||
| === afk is now known as mthaddon | ||
| === mthaddon is now known as afk | ||
| === afk is now known as mthaddon | ||
| lifeless | wgrant: I agree. I wouldn't put that in the same place.I was responding to your ideal statement, not the concrete advice. | 05:22 |
| RenatoSilva | so branches are just for merging | 05:23 |
| dash | what else could they be for? | 05:24 |
| wgrant | lifeless: Oh, right. | 05:38 |
| RenatoSilva | dash: :) | 05:38 |
| RenatoSilva | is there a way to send an automatic email when I commit to my branch? | 05:39 |
| wgrant | RenatoSilva: Launchpad sends them automatically. | 05:39 |
| wgrant | And there's a plugin for bzr (bzr-email?) to do it locally. | 05:40 |
| RenatoSilva | wgrant: I mean in local branch | 05:40 |
| RenatoSilva | wgrant: I can't put corp emails there in lp | 05:40 |
| RenatoSilva | ok bzr-email I'll tae a look | 05:40 |
| RenatoSilva | I would like also to run some specific command which would receive the commit info.. I want to do something like this: | 05:41 |
| RenatoSilva | bzr commit -m "Implemented the feature abc." | 05:41 |
| jml | wuuu triage! | 05:42 |
| RenatoSilva | mail sent to your-boss@your-company.com | 05:42 |
| lifeless | jml: ? | 05:42 |
| RenatoSilva | additiona trigger executed: smart-dot-project-task-logger | 05:43 |
| jml | lifeless: you are changing lots of bugs that I'm subscribed to from "New" to $OTHER_STATE | 05:43 |
| jml | lifeless: that makes me happy :) | 05:43 |
| lifeless | jml: I'm doing performance runs on check | 05:43 |
| lifeless | so I'm just bit twiddling while I wait | 05:43 |
| wgrant | RenatoSilva: It sounds like you want to look at hooks. | 05:43 |
| lifeless | yay lp oops on bug page | 05:43 |
| lifeless | RenatoSilva: bzr help hooks | 05:44 |
| RenatoSilva | ok thanks | 05:44 |
| RenatoSilva | the ahrd part is to write dot-project integration tough. | 05:45 |
| RenatoSilva | it's so boring to commit, copy comment, open browser, paste comment, and commit to the task | 05:45 |
| jml | poolie: btw, am near halfway through "The Mauritius Command" and have recently read "HMS Surprise". | 05:46 |
| jml | poolie: the phrase, "Jack, you have debauched my sloth!" came up. :) | 05:46 |
| poolie | did i tell you i read O'Brian's "The Catalans" in Catalunya? it was good. | 05:47 |
| poolie | oh jack. | 05:47 |
| poolie | (: (: | 05:47 |
| jml | poolie: no you didn't. | 05:51 |
| RenatoSilva | does bzr-email accept only one mail? | 05:51 |
| lifeless | to send to? | 05:53 |
| RenatoSilva | yes | 05:53 |
| SoftCoder | hello? | 05:53 |
| RenatoSilva | it does not mention multiple addresses :( | 05:53 |
| SoftCoder | Using Ubuntu 9 and Olive isn't working anymore gives me: nable to load plugin 'gtk'. It requested API version (1, 13, 0) of module <module 'bzrlib' from '/usr/lib/python2.6/dist-packages/bzrlib/__init__.pyc'> but the minimum exported version is (1, 15, 0), and the maximum is (1, 15, 0) | 05:54 |
| SoftCoder | Any ideas what I can do? | 05:54 |
| lifeless | RenatoSilva: likely; feel free to file a bug if you like. You could set an alias in your mail environment | 05:54 |
| lifeless | SoftCoder: upgrade your bzr-gtk plugin | 05:54 |
| SoftCoder | I'm on 0.95 (isn't that the latest)? | 05:55 |
| lifeless | SoftCoder: bzr-gtk is version-locked to bzr | 05:56 |
| SoftCoder | bzr is running 1.15.1 | 05:56 |
| lifeless | sure. All I'm saying is that the bzr-gtk version doesn't match. | 05:57 |
| lifeless | there shouldhave been a release fixing it | 05:57 |
| lifeless | a | 05:57 |
| lifeless | are you using the pPA? | 05:57 |
| SoftCoder | I didn't see any release yet and wondered if anyone knew where I could find a fix? | 05:57 |
| RenatoSilva | lifeless: fortunately there's a devel-team alias at work :) | 05:57 |
| SoftCoder | I think I added the ppa let me double check | 05:58 |
| RenatoSilva | how do I rollback to the latest commited version? | 06:00 |
| RenatoSilva | it's like revert to base in cvs | 06:01 |
| lifeless | 'bzr revert' will undo all your changes | 06:01 |
| RenatoSilva | thanks! | 06:01 |
| thumper | $ bzr info -v | 06:03 |
| thumper | bzr: ERROR: Unknown repository format: 'Bazaar development format - chk repository with bencode revision serialization (needs bzr.dev from 1.15)\n' | 06:03 |
| thumper | ??? | 06:03 |
| thumper | I created the repo yesterday | 06:04 |
| thumper | upgraded bzr from the nightly ppa today | 06:04 |
| thumper | now it doesn't understand | 06:04 |
| lifeless | yup | 06:04 |
| lifeless | dev format | 06:04 |
| thumper | huh? | 06:04 |
| thumper | so what do I do now? | 06:04 |
| lifeless | install the old package | 06:04 |
| thumper | and ... | 06:04 |
| lifeless | upgrade to the 2a format | 06:04 |
| thumper | it didn't know about the 2a format | 06:05 |
| lifeless | odd | 06:05 |
| lifeless | I'm not sure why that string isn't recognised | 06:05 |
| lifeless | poolie: ^ you were the last one touching this area I think | 06:05 |
| jml | a patch went through that changed the string from 1.15 to 1.16, I think. | 06:05 |
| SoftCoder | I beleive I havce the pps for bzr and still have the API issues.. my software sources in Ubuntuy says: http://ppa.launchpad.net/bzr/ppa/ubuntu DISTRO: jaunty Components: main | 06:06 |
| lifeless | ugh | 06:06 |
| SoftCoder | softcoder@softhauslinux:~$ bzr check | 06:06 |
| SoftCoder | Unable to load plugin 'gtk'. It requested API version (1, 13, 0) of module <module 'bzrlib' from '/usr/lib/python2.6/dist-packages/bzrlib/__init__.pyc'> but the minimum exported version is (1, 15, 0), and the maximum is (1, 15, 0) | 06:06 |
| lifeless | jml: if you can find who did that, hint them up | 06:07 |
| lifeless | thumper: edit .bzr/repository/format | 06:07 |
| thumper | SoftCoder: you need to upgrade bzrtools | 06:07 |
| lifeless | change 15 to 16 | 06:07 |
| lifeless | thumper: thats gtk thats erroring | 06:07 |
| lifeless | thumper: see the start of the line ;) | 06:07 |
| thumper | oh | 06:07 |
| lifeless | SoftCoder: so, apt-get update | 06:07 |
| lifeless | SoftCoder: and apt-get upgrade, that may get you a newer version | 06:07 |
| lifeless | SoftCoder: failing that file a bug on bzr please; we maintain that ppa | 06:08 |
| poolie | yes, what lifeless said should work | 06:08 |
| poolie | hi thumpber | 06:08 |
| lifeless | and its meant to be kept in lock-sync | 06:08 |
| thumper | aarh | 06:08 |
| thumper | I edited the repository format | 06:09 |
| thumper | bzr info worked then | 06:09 |
| thumper | but upgrade fails | 06:09 |
| thumper | bzr: ERROR: Cannot convert to format <RepositoryFormat2a>. Does not support nested trees | 06:09 |
| lifeless | \o/ bzr smash time | 06:18 |
| SoftCoder | how do i manually install bzrtools? (doing apt did not get anything new) | 06:19 |
| SoftCoder | I d/l bzrtools 16 manually how do i install it? | 06:19 |
| SoftCoder | nevermind | 06:20 |
| SoftCoder | found INSTALL file | 06:20 |
| lifeless | poolie: please not be setting things to new *after* triage work. | 06:25 |
| poolie | lifeless: our edits overlapped | 06:26 |
| lifeless | on bug 387158? looks like 20 minutes apart to me ;) | 06:27 |
| ubottu | Launchpad bug 387158 in bzr "bound branch reports "pack-names is not an index of type..."" [Undecided,Incomplete] https://launchpad.net/bugs/387158 | 06:27 |
| poolie | nevertheless | 06:27 |
| lifeless | ok | 06:27 |
| thumper | jml: is the upgrade issue above a 1.16 blocker? | 06:30 |
| lifeless | whats the code submit address again? | 06:30 |
| poolie | sorry anyhow | 06:31 |
| thumper | lifeless: to LP? | 06:31 |
| lifeless | thumper: yes | 06:31 |
| jml | thumper: the "nested trees" one? don't know. | 06:31 |
| thumper | merge@code.launchpad.net | 06:31 |
| lifeless | thanks | 06:31 |
| * thumper heads off for the day | 06:31 | |
| RenatoSilva | SimpleXMLRPCServer is missing in BzrEclipse, any ideas on how to solve this? How to make bzr use other python than its built-in? | 06:33 |
| lifeless | poolie: so I'd like to understand whether you meant to change the status to new, or whether LP saved too many variables and it was essentially a conflict | 06:33 |
| lifeless | poolie: so that we can file a bug if needed | 06:34 |
| poolie | i did say to change the state from incomplete back to new | 06:34 |
| lifeless | ok | 06:34 |
| lifeless | RenatoSilva: the bzreclipse wiki page has complete installation instructions | 06:34 |
| poolie | i did not realize you'd already changed it to something else | 06:34 |
| RenatoSilva | lifeless: I followed the doc, this error is happening in ' get log ' for example | 06:37 |
| fullermd | jml: I'd vote for it being one... | 06:38 |
| lifeless | RenatoSilva: oh. Anyhow, you can run 'python <path>/bin' to run with a specific python | 06:39 |
| lifeless | verterok_: may know though | 06:39 |
| lifeless | path/bzr I mean :) | 06:39 |
| lifeless | RenatoSilva: if this is on windows, with our bundled installers, please file a bug. | 06:39 |
| fullermd | (makes all those dev formats traps) | 06:40 |
| poolie | igc: you have about 5 approved merges in launchpad | 06:40 |
| poolie | if you're still awake you should land some... | 06:40 |
| igc | poolie: except for the eol-doc one, the rest need some tweaking and probably resubmission | 06:42 |
| RenatoSilva | how can I change the python, bzr from windows installer is exe only | 06:43 |
| lifeless | RenatoSilva: you can't easily. Please file a bug. | 06:43 |
| RenatoSilva | I have 2.6 here iwth such RPC file | 06:44 |
| poolie | RenatoSilva: you might need to separately install python from python.org? | 06:44 |
| igc | poolie: though this one probably just needs me to reply to jam: https://code.edge.launchpad.net/~ian-clatworthy/bzr/faster-log-file/+merge/6805 | 06:44 |
| RenatoSilva | poolie: ^ | 06:44 |
| lifeless | RenatoSilva: we have alternate installation instructions for installing with an existing python | 06:44 |
| lifeless | RenatoSilva: you will need to follow those to work around until a new installer is spun with the libraries you need. | 06:44 |
| RenatoSilva | lifeless: yeah, maybe that's what I'll have to do :( | 06:44 |
| * igc takes a break - bbl | 06:45 | |
| RenatoSilva | lifeless: https://bugs.launchpad.net/bzr-eclipse/+bug/387651 | 06:52 |
| ubottu | Launchpad bug 387651 in bzr-eclipse "Error on log command: no module named SimpleXMLRPCServer" [Undecided,New] | 06:52 |
| lifeless | thanks | 06:55 |
| RenatoSilva | np | 06:55 |
| RenatoSilva | QBzrEclipse don't want to get out of my Eclipse o.O | 06:57 |
| cellofellow | how do I create a patch file I'd attach to a Launchpad bug report? | 07:09 |
| RenatoSilva | cellofellow: diff command | 07:12 |
| cellofellow | so, bzr diff > my.patch | 07:12 |
| cellofellow | something like that? | 07:12 |
| lifeless | cellofellow: or bzr send -o my.patch | 07:13 |
| cellofellow | which is preferred and why? | 07:14 |
| lifeless | bzr send preserves metadata and sends your commits as a group | 07:14 |
| lifeless | bzr diff shows uncommitted changes | 07:14 |
| cellofellow | ah, ok | 07:14 |
| cellofellow | ok, will use send, thanks | 07:15 |
| wgrant | cellofellow: Why not attach the branch to the bug? | 07:15 |
| cellofellow | cause I'm not that smart :P | 07:16 |
| cellofellow | so, I'd push that to lp:~cellofellow/project/branches/mybranch | 07:17 |
| cellofellow | or something like that? | 07:18 |
| wgrant | Without the /branches, but yes. | 07:18 |
| cellofellow | ok | 07:18 |
| RenatoSilva | cellofellow: to lp:~cellofellow/project/mybranch-purporse | 07:18 |
| vila | hi all | 07:18 |
| * RenatoSilva meant diff command itself | 07:18 | |
| wgrant | cellofellow: https://help.launchpad.net/Code/BugAndBlueprintLinks#Fixing%20bugs%20in%20dedicated%20branches | 07:19 |
| === mthaddon is now known as afk | ||
| lifeless | EODing | 07:53 |
| poolie | night lifeless | 08:06 |
| * vila feels a crash coming.... | 08:50 | |
| bialix | http://www.ericsink.com/entries/hg_denzel.html | 09:09 |
| === Kissaki^0ff is now known as Kissaki | ||
| scor | davidstrauss: I should ask here instead | 13:08 |
| scor | is there a way to get bzr diff to show the function in which each hunk applies (like in cvs diff -up)? | 13:08 |
| scor | from the cvs docs: " -p --show-c-function Show which C function each change is in. | 13:11 |
| scor | " | 13:11 |
| Peng_ | Does "write a patch adding support for that" count as "a way"? | 13:11 |
| Peng_ | You can probably do it with an external diff program that supports that. | 13:12 |
| verterok_ | lifeless: regarding RenatoSilva issue with bzr-xmloutput, and installer is provided that includes SimpleXMLRPCServer.py for bzr.exe users | 13:17 |
| verterok_ | btw, good morning! | 13:17 |
| basti_ | Hi everyone! Is there a way to change the parent of a particular revision to a another branch? | 13:43 |
| basti_ | I started work on a branch from SVN trunk but need to put it into a SVN branch of its own again. Any thoughts? | 13:44 |
| vila | basti_: did you look at 'bzr rebase' ? | 13:47 |
| basti_ | I keeps telling me that the brnches have no common ancestor | 13:48 |
| basti_ | Alternatively, is there a quick way of re-applying revisions as patches? | 13:51 |
| vila | basti_: sorry, I don't know bzr-svn nor svn good enough to help you there :-/ | 13:53 |
| vila | jam: ping | 13:54 |
| basti_ | Never mind but thanks anyway | 13:54 |
| vila | basti_: I suspect you didn't build your branches as bzr-svn expect them to be built (they should have a common ancestor if you start them from the same svn branch) but that's all I can think of | 13:56 |
| pygi | basti_: you want to apply commits from bzr to a svn branch? | 14:02 |
| pygi | hi vila | 14:02 |
| vila | pygi: hi | 14:02 |
| basti_ | pygi: yes but it is a bit more complicated than that (isn't always) | 14:03 |
| pygi | basti_: tell me? | 14:03 |
| basti_ | pygi: I started some months ago with a bzr branch from SVN trunk | 14:03 |
| basti_ | Now I need to put i back on a SVN brnch again | 14:04 |
| basti_ | That was before the bzr-svn plugin was able to create SVN branches | 14:04 |
| pygi | basti_: http://bogdano.googlecode.com/svn/tools/bzr2svn/bzr2svn.py | 14:04 |
| pygi | can this help? | 14:04 |
| pygi | it patches revisions from a bazaar branch to a subversion working copy and commiting them one by one. | 14:05 |
| pygi | s/commiting/commits | 14:05 |
| basti_ | pygi: I'll give it a try. Thanks | 14:05 |
| pygi | most welcome | 14:05 |
| pygi | vila: how are you doing? :) | 14:06 |
| vila | pygi: overcommitted :-) | 14:06 |
| pygi | and I told you not to do it :p | 14:06 |
| jam | vila: pong | 14:50 |
| jam | rockstar: happy birthday, (according to skype) | 14:55 |
| === verterok_ is now known as verterok | ||
| === Kissaki is now known as Kissaki^0ff | ||
| === afk is now known as mthaddon | ||
| === nevans1 is now known as nevans | ||
| ablmf1 | Could TortoiseBZR use proxy? | 16:22 |
| ablmf1 | I mean, http proxy | 16:23 |
| vila | ablmf1: it should (relying on bzr for that), did you try ? | 16:32 |
| ablmf1 | vila: I don't know hot to set that for bazzar on windows. I googled a while, can not find some clue | 16:33 |
| vila | how do you set it for your browser ? | 16:34 |
| ablmf1 | I set it in IE. | 16:35 |
| ablmf1 | And in firefox. | 16:35 |
| ablmf1 | But bazzar still can not download code | 16:35 |
| ablmf1 | I can browser web pages | 16:36 |
| ablmf1 | Does bazzar use https? | 16:36 |
| vila | ablmf1: ok, but how ? Manual proxy. automatic via URL ? | 16:36 |
| ablmf1 | But using Internet Options in IE, of course. | 16:38 |
| ablmf1 | By using Internet Options in IE, of course. | 16:38 |
| vila | ablmf1: ok, but do you use a '.pac' file or do you specify a host and a port | 16:39 |
| ablmf1 | No, not by a .pac file. I manually specify it. | 16:40 |
| vxnick | can anyone point me to some docs for the bazaar server (is this the same as SmartServer)? there's a smattering of docs on the bzr site but nothing complete by the looks of it | 16:40 |
| vila | ablmf1: hmm, python is tricking us then, it's supposed to provides the proxy in that case, | 16:43 |
| === abentley1 is now known as abentley | ||
| ablmf1 | OK, maybe that's because other problems. | 16:44 |
| ablmf1 | vila: thanks anyway | 16:44 |
| vila | ablmf1: you will need to do that "manually" by setting an environment variable like: http_proxy with a value of 'http://<host>:<port>' | 16:44 |
| ablmf1 | vila: I will see if it works. thanks | 16:45 |
| ablmf1 | I found a command like this "call bzr branch lp:oah -rtag:0.3 trunk" | 17:05 |
| ablmf1 | What does "lp:oah" mean? | 17:05 |
| rockstar | jam, thanks. | 17:05 |
| ablmf1 | How can bzr locate the repository without a full URL? | 17:05 |
| ablmf1 | OAH build system depends on bazaar. It really confuse me. | 17:06 |
| LarstiQ | ablmf1: lp: is shorthand expanded by the launchpad plugin | 17:07 |
| LarstiQ | ablmf1: so lp:oah is the development focus of https://launchpad.net/oah | 17:07 |
| LarstiQ | ablmf1: see `bzr info lp:oah` for instance | 17:08 |
| ablmf1 | I could open it in web. But "bzr branch lp:oah -rtag:0.3 trunk" always fail. Python says "time out" | 17:09 |
| LarstiQ | ablmf1: it works for me, so that suggest there is something wrong at your end. | 17:11 |
| LarstiQ | ablmf1: could you pastebin the output of `bzr info lp:oah`? | 17:12 |
| LarstiQ | ablmf1: do you use a https proxy, can you branch anything from launchpad at all? | 17:12 |
| ablmf1 | You have not informed bzr of your Launchpad ID, and you must do this to | 17:13 |
| ablmf1 | write to Launchpad or access private data. See "bzr help launchpad-login". | 17:13 |
| === mthaddon is now known as afk | ||
| === afk is now known as mthaddon | ||
| ablmf1 | Oh, God. It works now... | 17:13 |
| ablmf1 | Perhaps it's the problme of network. | 17:14 |
| ablmf1 | Thans a lot | 17:14 |
| LarstiQ | ablmf1: possibly. | 17:14 |
| LarstiQ | ablmf1: the 'time out' you mentioned looks like a network timeout | 17:14 |
| LarstiQ | ablmf1: that is either because you can't reach launchpad at all, or because of an intermittent network problem | 17:14 |
| LarstiQ | ablmf1: a firewall could cause it for example | 17:15 |
| ablmf1 | Perhaps because of the network condition. The downloading speed is very slow, 5 - 10 kB/s | 17:16 |
| ablmf1 | Might took hours for downloading these code I want. | 17:16 |
| === mthaddon is now known as afk | ||
| === afk is now known as mthaddon | ||
| === omichael is now known as omichael_afk | ||
| mrooney | How might I go about un-adding everything added in a current working copy? I have modified things so I can't just revert the whole thing | 18:35 |
| fullermd | bzr rm has a --new option... | 18:36 |
| ddaa | so that would be "bzr rm -R --new ." | 18:37 |
| ddaa | make a copy of the whole thing before | 18:37 |
| fullermd | -R? | 18:37 |
| ddaa | oh, no recursive :) | 18:37 |
| ddaa | then "bzr ls kind=file | xargs bzr rm --new" | 18:38 |
| ddaa | then "bzr ls --kind=file | xargs bzr rm --new" | 18:38 |
| fullermd | Actually, I assumed that just 'bzr rm --new' would do it. | 18:38 |
| fullermd | I'd assume that passing filenames would make it always rm them, sorta like passing filenames to add overrides ignores. | 18:39 |
| === omichael_afk is now known as omichael | ||
| ddaa | oh | 18:45 |
| ddaa | that would make sense, but it's a bit counter intuitive to do "rm" without any argument. | 18:46 |
| ddaa | you could say the same about "add", but I guess I'm more used to this one. | 18:46 |
| fullermd | (I don't know if it actually works that way, it's just what I expect) | 18:46 |
| fullermd | It certainly calls for some experimentation before you run with it. | 18:47 |
| jonnydee1 | bzr rm --keep should work | 18:47 |
| mrooney | okay now I am confused as to what command would actually work while keeping the files and not actually changing anything | 18:53 |
| mrooney | but just un-adding newly added files | 18:53 |
| jonnydee1 | mrooney: I tested this one: bzr rm --keep `bzr added` which seems to work... | 19:00 |
| jonnydee1 | on linux/unix, at least | 19:01 |
| kfogel | What's the currently recommended Best Tool for converting from Subversion to Bazaar? | 19:39 |
| kfogel | (opinionated opinions welcome) | 19:39 |
| Tak | converting what? | 19:39 |
| kfogel | http://developer.berlios.de/projects/python/ | 19:40 |
| kfogel | Tak: a Subversion repository, presumably including branches | 19:40 |
| kfogel | (let me see if he has any...) | 19:40 |
| Tak | bzr help svn-import? | 19:41 |
| kfogel | Tak: no branches even. | 19:41 |
| kfogel | Tak: oh! didn't know about that command. thanks | 19:41 |
| kfogel | Tak: bzr-svn seems to be the best option | 19:45 |
| beuno | kfogel, I think bzr-svn is the best | 19:45 |
| beuno | there's fastimport | 19:45 |
| beuno | but I think that's for one-time imports only | 19:46 |
| kfogel | beuno: this guy is doing a one-time, but even so I think bzr-svn is probably the way to go. | 19:46 |
| beuno | yeah, branch once from it, forget | 19:47 |
| RenatoSilva | Hi. "If you have Python 2.4/2.5 already installed on your system, then you could use the Python-based installer instead of the standalone Windows installer" | 20:41 |
| RenatoSilva | Won't it work with 2.6? | 20:41 |
| beuno | RenatoSilva, it does | 20:41 |
| RenatoSilva | ok | 20:41 |
| RenatoSilva | http://bazaar-vcs.org/BzrWin32Installer#bzr-dependencies | 20:42 |
| RenatoSilva | are they all optional? | 20:42 |
| RenatoSilva | what about bzr win32 too? | 20:43 |
| RenatoSilva | actually, pywin32 | 20:46 |
| RenatoSilva | doesn't it come with standard python? | 20:46 |
| sidnei | RenatoSilva: no it doesn't | 21:00 |
| beuno | spiv, lifeless, ping | 21:34 |
| beuno | (good morning, actually) | 21:35 |
| beuno | I've been hitting what I believe is a a bbc smart server bug | 21:35 |
| RenatoSilva | sidnei: sorry I cleaned the screen and I can't recall what is your answer for :( | 21:35 |
| beuno | after upgrading to 1.16rc1 | 21:35 |
| beuno | bug 388020 | 21:35 |
| ubottu | Launchpad bug 388020 in bzr "UnknownErrorFromSmartServer when pushing with 1.16rc1" [Undecided,New] https://launchpad.net/bugs/388020 | 21:35 |
| SamB | oh no! you won't be able to watch the newest episode of Monty Python! | 21:35 |
| sidnei | RenatoSilva: you asked if pywin32 ships with standard python | 21:36 |
| RenatoSilva | sidnei: ah ok, I checked it out, and I just nedd it if I don't use plink to talk with pageant, something like that | 21:38 |
| spirov92 | is there a way to see the commits I did today? | 21:44 |
| beuno | spirov92, you should be able to do something like: bzr log -r date:today | 21:45 |
| beuno | spirov92, bzr log -r date:today.. | 21:45 |
| spirov92 | yay, it works | 21:45 |
| beuno | to be more precise | 21:45 |
| beuno | (otherwise you only get one) | 21:45 |
| Peng_ | Is it a bad idea to use --2a? | 21:50 |
| Peng_ | Oh, I forgot, I need to keep some 1.9-rich-root repos around, so all of the conversions would probably hurt performance. | 21:53 |
| RenatoSilva | Oh it's hard to install bzr separate from python! | 22:03 |
| RenatoSilva | I run setup.py and get this error for bzr itself: building 'bzrlib._btree_serializer_c' extension, Cannot build extensions. Use "build_ext --allow-python-fallback" to use slower python implementations instead. error: Unable to find vcvarsall.bat | 22:03 |
| RenatoSilva | Besides teh downlaod mentioned here is a windows installer with built-in python! http://bazaar-vcs.org/WindowsInstall | 22:06 |
| RenatoSilva | however it is supposed to be standalone bzr sorces | 22:06 |
| RenatoSilva | It seems an old non-sense page | 22:07 |
| RenatoSilva | bzr 1.15-1 python2.5 installer --> it installs into python 2.5 (I hope into 2.6 too) not installs python together | 22:11 |
| RenatoSilva | it's not clear | 22:11 |
| RenatoSilva | doesn't work with 2.6! grrr | 22:12 |
| garyvdm | RenatoSilva: bzr does work with python 2.6. It's just there is no python 2.6 installer. | 22:17 |
| garyvdm | Why don't you want to use the Windows Standalone Installer? | 22:18 |
| RenatoSilva | garyvdm: because of bug 387651 | 22:21 |
| ubottu | Launchpad bug 387651 in bzr "Error on log command: no module named SimpleXMLRPCServer" [High,Confirmed] https://launchpad.net/bugs/387651 | 22:21 |
| garyvdm | RenatoSilva: I think what Guillermo Gonzalez was trying to tell you is that you did not use the Windows Installer for bzr-xmloutput. If you did, it would install SimpleXMLRPCServer for you | 22:24 |
| garyvdm | bzr-xmloutput is used by BzrEclipse | 22:24 |
| verterok | RenatoSilva: Hi, garyvdm is right, using the bzr-xmloutput windows installer is enough to get all the dependencies in place | 22:25 |
| RenatoSilva | I installed xmloutput before and successfully bzr log --xml | 22:26 |
| verterok | RenatoSilva: how did you installed it? | 22:26 |
| RenatoSilva | I'm trying to remeber | 22:26 |
| RenatoSilva | bzr branch | 22:26 |
| verterok | RenatoSilva: that should work if you'r using bzr with a full python install | 22:27 |
| verterok | RenatoSilva: but bzr.exe don't include SimpleXMLRPCServer, so if you are using bzr.exe you need to install bzr-xmloutput with the installer or get a copy of SimpleXMLRPCServer.py a put it the bzr.exe pythonpath | 22:28 |
| RenatoSilva | ok | 22:29 |
| RenatoSilva | verterok: I will install python 2.5 | 22:29 |
| verterok | RenatoSilva: be aware that in order to use a bzr in windows (not bzr.exe) you need to install all the bzr dependencies | 22:30 |
| RenatoSilva | verterok: it seems that I don't need anyof them | 22:30 |
| verterok | RenatoSilva: take a look to: http://bazaar-vcs.org/WindowsDownloads | 22:31 |
| RenatoSilva | since exe for xmloutput will solve the problem, well it may be better to use bzr.exe | 22:31 |
| verterok | RenatoSilva: belive me, you need them :) | 22:31 |
| verterok | RenatoSilva: sure, it's the easies way. :) | 22:31 |
| verterok | *easiest | 22:31 |
| RenatoSilva | *easy :) | 22:32 |
| verterok | heh :) | 22:32 |
| RenatoSilva | verterok: that bug is invalid isn't it? Or would they want to include that dependency into the main bzr installer? | 22:36 |
| verterok | RenatoSilva: that idea was discussed some time ago, and the result was the bzr-xmlotuput installer...so I think it's invalid ;-) | 22:37 |
| RenatoSilva | verterok: could you tell this to them | 22:42 |
| verterok | RenatoSilva: sure | 22:42 |
| RenatoSilva | ok | 22:49 |
| RenatoSilva | tahnks everybody | 22:49 |
| verterok | RenatoSilva: np, glad to help | 22:56 |
| Peng_ | Aww, I tried to work around bug #348308 with monkeypatching, os.execv, and a nice helping of evil, but it didn't work. :( | 23:10 |
| ubottu | Launchpad bug 348308 in bzr "Smart server jail breaks bzr+http with shared repos" [High,Triaged] https://launchpad.net/bugs/348308 | 23:10 |
| * Peng_ /away! | 23:16 | |
| treeform | hi all! Bzr on windows is super slow, any explanations? it must be the Turtoze like overlay icons | 23:19 |
| treeform | the update for them seem very delayed and it takes some serous CPU | 23:20 |
| garyvdm | treeform: Yes, TortoiseBzr unfortunately still suffers from bad performance. | 23:35 |
| treeform | can its functionality be disabled? | 23:36 |
| jml | james_w, you still around? | 23:37 |
| garyvdm | treeform: You can uninstall it, or... | 23:46 |
| garyvdm | treeform: you can go into the options, and disable icon overlays for all drive types. | 23:46 |
| garyvdm | It then still loads, but doesn't do a status for every file. | 23:47 |
| treeform | cool | 23:47 |
| treeform | the numbers of crazy bugs make me uneasy https://bugs.launchpad.net/tortoisebzr/+bugs?search=Search&field.status=New&field.status=Incomplete&field.status=Confirmed&field.status=Triaged&field.status=In+Progress&field.status=Fix+Committed&field.status=Fix+Released&field.status=Invalid&field.status=Won%27t+Fix&field.omit_dupes.used= | 23:48 |
| thumper | lifeless, jam or other hard core bzr type hacker: how can I force an upgrade from --development7 to --2a? | 23:48 |
| thumper | bzr: ERROR: Cannot convert to format <RepositoryFormat2a>. Does not support nested trees | 23:48 |
| thumper | I'm guessing --development7 was configured to support nested trees | 23:49 |
| thumper | I know my repo doesn't use nested trees | 23:49 |
| thumper | how can I force the conversion? | 23:49 |
| garyvdm | treeform: and unfortunately there is currently no one working on it. | 23:50 |
| treeform | why was it stopped? | 23:51 |
| thumper | treeform: the developer got a full time job | 23:52 |
| garyvdm | treeform: that bugs query contains lots of fix released and invalid bugs. This is more accurate representation: https://bugs.launchpad.net/tortoisebzr/+bugs | 23:52 |
| garyvdm | Alex is working on the critical bug 335362 | 23:53 |
| ubottu | Launchpad bug 335362 in tortoisebzr "[master] UnicodeDecodeError when processing paths that have the non-ascii characters" [Critical,Confirmed] https://launchpad.net/bugs/335362 | 23:53 |
Generated by irclog2html.py 2.7 by Marius Gedminas - find it at mg.pov.lt!
