| === oubiwann_ is now known as oubiwann | ||
| === oubiwann_ is now known as oubiwann | ||
| === raimue is now known as Raim | ||
| === GaryvdM is now known as GaryvdM_work | ||
| bialix | GaryvdM_work: hi | 09:56 |
|---|---|---|
| bialix | GaryvdM_work: quick question: how's grouping in qcommit/treewidget supposed to work? | 09:56 |
| bialix | if I have 2 changed files in one directory they're not grouped into folder, is it intended? | 09:57 |
| bialix | GaryvdM_work: here is http://imagebin.ca/view/xZhU_h.html | 09:58 |
| GaryvdM_work | bialix: if there are more than 4 file, it's grouped | 10:00 |
| bialix | hmmm | 10:00 |
| bialix | IMO 3 is better | 10:00 |
| bialix | ok, anyway, thanks for answer | 10:01 |
| GaryvdM_work | bialix: The const for that is in lib/treewidget.py line 116 | 10:02 |
| GaryvdM_work | http://bazaar.launchpad.net/~qbzr-dev/qbzr/trunk/annotate/head%3A/lib/treewidget.py#L116 | 10:02 |
| bialix | aha, thanks | 10:03 |
| GaryvdM_work | You can see from my comment that I was thinking about making a config option for it | 10:03 |
| GaryvdM_work | bialix: If you change it, or make it configurable, you will need to adjust the tests. | 10:03 |
| * bialix want qbug dialog to send bug reports to LP from command-line without browser, sigh, dreams-dreams | 10:04 | |
| bialix | GaryvdM_work: ok, not now | 10:04 |
| gour | hiya, i'd like to try using bzr hg plugin in order to push/pull to the hg project using hg forest extension. is it possible to achieve it? | 10:09 |
| bialix | gour: it seems pull you can, but push not yet | 10:18 |
| bialix | what's special about forest extension? | 10:18 |
| bialix | we have similar thing in bzr: scmproj plugin | 10:18 |
| gour | bialix: forest try to solve something like svn's externals, i.e. nested repos | 10:24 |
| gour | let me check that plugin | 10:24 |
| bialix | scmproj aims the same | 10:25 |
| bialix | but I've designed it to be VCS agnostic, though current implementation supports only bzr | 10:25 |
| gour | that's ncie to hear | 10:25 |
| bialix | gour: why you don't use hg directly? | 10:26 |
| gour | bialix: i've flakey internet conenction (mobile 3g) and running 'hg fpull' often fails forcing me to run 'hg recover' in subrepos, so i hope bzr might be more robust network-wise | 10:27 |
| bialix | ah, that's possib;e | 10:27 |
| bialix | ah, that's possiblke | 10:27 |
| bialix | rats | 10:28 |
| bialix | ah, that's possible | 10:28 |
| gour | :-) | 10:29 |
| bialix | gour: so the problem in builtin hg pull? | 10:29 |
| bialix | or fpull does something bad behind the scene? | 10:29 |
| gour | bialix: well, it should just traverse all the subrepos and full from 'em | 10:30 |
| gour | bialix: i'll try scmproj and see how it works | 10:31 |
| bialix | full? pull? | 10:31 |
| bialix | gour: feel free to ask about scmproj, I'm the author and docs is not complete | 10:31 |
| gour | s/full/pull | 10:31 |
| gour | ok, i'll report back. bbs | 10:32 |
| bialix | ok | 10:32 |
| bialix | is it public project? | 10:33 |
| gour | bialix: yep, tryton.org | 10:45 |
| bialix | gour: it's a big project | 10:59 |
| bialix | it seems you need bzr-hg in the end anyway | 10:59 |
| gour | yeah...just wonder if i could organize repo in such a way to be able to pull in one swing | 11:00 |
| bialix | GaryvdM_work: found critical regression in qcommit: https://bugs.launchpad.net/qbzr/+bug/479068 | 11:08 |
| ubottu | Launchpad bug 479068 in qbzr "qcommit crashed if there is removed files" [Critical,New] | 11:08 |
| GaryvdM_work | :-( | 11:08 |
| * bialix back to 0.15 | 11:09 | |
| GaryvdM_work | bialix: Bug 479068 seems to be windows only | 11:21 |
| ubottu | Launchpad bug 479068 in qbzr "qcommit crashed if there is removed files" [Critical,New] https://launchpad.net/bugs/479068 | 11:21 |
| GaryvdM_work | It's beeing caused by the icon for removed items. | 11:21 |
| gour | huh, now i read about bzr' nested tree... | 11:29 |
| gour | considering that hg has forest which is supposed to be replaced with subrepos (not clean how it will look like), it seems that with 2.x release bzr is greatly reducing any possible gap with, at least, hg...git is anyway too complicated | 11:31 |
| GaryvdM_work | gour: note that nested tree is not complete yet. | 11:31 |
| gour | GaryvdM_work: ahh...what is missing? | 11:31 |
| gour | still, chosing bzr over hg is very promising now | 11:32 |
| GaryvdM_work | gour: I'm not exactly sure, but I think there is a working implementation, but it has not been merged to bzr.dev due to design concerns. | 11:32 |
| gour | GaryvdM_work: i see there are 'join' and 'split' commands in 2.0 | 11:33 |
| GaryvdM_work | gour: Status of nested trees: http://bazaar-vcs.org/NestedTreeProgress | 11:36 |
| gour | thanks | 11:36 |
| === mrevell is now known as mrevell-lunch | ||
| bialix | GaryvdM_work: but you fix it in one go with another bug | 12:25 |
| GaryvdM_work | bialix: Yhea - it's not windows specific. | 12:26 |
| bialix | thanks | 12:26 |
| bialix | is it correct to write in NEWS about: Fixed compatibility with PyQt 4.4. | 12:27 |
| bialix | GaryvdM_work: ^ ? | 12:27 |
| GaryvdM_work | bialix: With newer pyqt (4.6) you don't have to return a QVarent, but with 4.4, and 4.5 youdo | 12:27 |
| bialix | it's nice of course | 12:28 |
| GaryvdM_work | bialix: Yes I should update NEWS - I'll do that later | 12:28 |
| bialix | I'm do it now | 12:28 |
| GaryvdM_work | bialix: Any ideas on bug 479093 | 12:29 |
| ubottu | Launchpad bug 479093 in qbzr "Treewidget: Can't revert from the context menu on windows" [Critical,Confirmed] https://launchpad.net/bugs/479093 | 12:29 |
| bialix | one sec | 12:29 |
| bialix | GaryvdM_work: does it occurs for any tree? | 12:31 |
| bialix | I'd say we keep read lock over tree and then trying to run operation which required write_lock | 12:31 |
| bialix | on Windows locks even within process are exclusive | 12:31 |
| * bialix knows everybody tired to hear this, last itme maybe: OSLMD | 12:32 | |
| bialix | GaryvdM_work: steps to repsoduce, please | 12:32 |
| bialix | GaryvdM_work: steps to reproduce, please | 12:32 |
| GaryvdM_work | bialix: all trees for me | 12:32 |
| GaryvdM_work | bialix: are you using tbzr? | 12:33 |
| bialix | no, why? | 12:33 |
| bialix | "all trees for me" -- what it means? | 12:33 |
| GaryvdM_work | bialix I am using tbzr - maybe it is due to tbzr | 12:33 |
| bialix | GaryvdM_work: btw, about building installer without TBZR, do you figure out what need to be disabled? | 12:33 |
| GaryvdM_work | bialix: I have not looked yet. | 12:34 |
| bialix | ping me when you'll be about this | 12:34 |
| GaryvdM_work | bialix: ok | 12:34 |
| bialix | I'll guide you | 12:34 |
| GaryvdM_work | thanks | 12:34 |
| bialix | (but don't try to ping me at 3am -- unlikely I'll be up all night) :-) | 12:35 |
| bialix | GaryvdM_work: btw, do you have any opinion on my new command logging? I hope it's not irritating | 12:36 |
| * bialix personnaly found it useful to see what's going on behind the scenes as debug tool | 12:37 | |
| GaryvdM_work | bialix: I like the idea - but when used without --ui-mode - to goes away so quickly, I can't see it. | 12:37 |
| bialix | Yep, that's problem | 12:38 |
| GaryvdM_work | bialix: if no --ui-mode, maybe write to stdout | 12:38 |
| bialix | we can emit it to terminal perhaps | 12:38 |
| bialix | right | 12:38 |
| GaryvdM_work | yes | 12:38 |
| bialix | :-) | 12:38 |
| bialix | ok, I'll do it soon | 12:38 |
| bialix | I'm not sure about length at which I should it truncate | 12:39 |
| bialix | right now it's 128 chars, maybe I need to make it configurable via qbzr.conf | 12:39 |
| GaryvdM_work | bialix: It would also be cool if you could have a console in explorer/qmain that shows everything that you have done, that you can also use as a shell. | 12:40 |
| GaryvdM_work | like dolfin - I'll find a screen shot of that... | 12:40 |
| bialix | yeah, luks said something like that about qmain | 12:40 |
| bialix | when I've asked him why for there is blank area at bottom | 12:40 |
| bialix | GaryvdM_work: I'm still under high pressure on my work, should finish the milestone this week | 12:41 |
| bialix | I hope next week I'll have some free time for qbzr | 12:41 |
| GaryvdM_work | bialix: cool. | 12:41 |
| bialix | I want to dedicate some time to finish and merge all merge proposals we have for very long time | 12:42 |
| GaryvdM_work | sigh, my current job is boring - I'm battling to focus on work :-( | 12:42 |
| bialix | after *that* discussion in bzr ML I see it's not fair whinning for bzr devs while we have long standing backlog in our | 12:42 |
| GaryvdM_work | qbzr is my escape :-) | 12:42 |
| bialix | :-) | 12:42 |
| bialix | do you want that I'll stop distract you now? ;-) | 12:43 |
| bialix | GaryvdM_work: and we desperately need good test suite, because it's hard to find regressions without running some edge cases | 12:44 |
| GaryvdM_work | bialix: Yes - and after reading fullermd's mail , I think just finishing of other people work is not to bad (like I did with Craigs qlog multi select) | 12:45 |
| bialix | yeah | 12:46 |
| bialix | I'm mostly tear between bugfixing of existing code and review others code | 12:46 |
| bialix | no time for my own ideas at all :-( | 12:46 |
| bialix | our beloved core devs sprinting in Brisbane again? | 12:47 |
| GaryvdM_work | jml: Are their any public notes of what you guys are talking about that the sprint? | 12:49 |
| * bialix waiting while Matthew Revell will get interview with Gary about Qbzr :-) | 13:05 | |
| GaryvdM_work | bialix: http://rudd-o.com/en/linux-and-free-software/a-cursory-look-into-kde-4-file-management-dolphin-beta/the-traditional-konsole-terminal-panel.jpg | 13:07 |
| GaryvdM_work | bialix: http://kubuntuforums.net/forums/index.php?topic=3099210.0 | 13:07 |
| bialix | GaryvdM_work: cool | 13:08 |
| * bialix wanna such thing for windows | 13:08 | |
| bialix | GaryvdM_work: I can reproduce the bug with lock even w/o TBZR | 13:10 |
| GaryvdM_work | bialix: oh | 13:10 |
| bialix | GaryvdM_work: any chance you keep tree locked after you load it | 13:10 |
| bialix | in treewidget? | 13:10 |
| GaryvdM_work | bialix: I don't think so. | 13:10 |
| * bialix trying to run with -Dlock | 13:11 | |
| bialix | ghaa! | 13:12 |
| bialix | OSLMD! OSLMD! ODLMD! | 13:12 |
| bialix | GaryvdM_work: http://pastebin.com/d41c45c26 | 13:13 |
| bialix | suspicious place is tree_write_locked method trying to obtain read lock | 13:13 |
| bialix | GaryvdM_work: any bells? | 13:14 |
| GaryvdM_work | am | 13:14 |
| GaryvdM_work | bialix: I'll going to try specifically taking a write lock. | 13:15 |
| * bialix has added log to bug | 13:15 | |
| GaryvdM_work | bialix: Fixed :-) | 13:16 |
| bialix | it was quick | 13:17 |
| bialix | really | 13:17 |
| GaryvdM_work | bialix: this was the fix. | 13:18 |
| GaryvdM_work | http://pastebin.com/d60f4032c | 13:18 |
| bialix | GaryvdM_work: :-D | 13:20 |
| awilkins | qbzr question : what's the dag-flavoured tree widget? | 13:21 |
| awilkins | And is there one for Java? :-) | 13:21 |
| GaryvdM_work | awilkins: we just use a std QTreeView, but we have a custom item delegate which renders the dag, and we implement the expanding and collapsing our selfs | 13:23 |
| awilkins | GaryvdM_work, that's pretty much what I figured I'd end up doing | 13:23 |
| GaryvdM_work | awilkins: May I ask, what for? | 13:24 |
| awilkins | Tree control for SNOMED-CT, a polydimensional DAG | 13:24 |
| awilkins | As in there is basically one main axis of traversal but there are also others | 13:24 |
| awilkins | SNOMED-CT is a health ontology | 13:24 |
| GaryvdM_work | awilkins: if using qt, there are bits you can reuse | 13:25 |
| bialix | does anybody knows the tool for windows to easily draw DAGs? I need prepare illustrations to my articles about bzr | 13:25 |
| bialix | something like these sexy graphs there http://doc.bazaar-vcs.org/migration/en/foreign/bzr-on-svn-projects.html | 13:26 |
| GaryvdM_work | awilkins: and if you are rendering bzr log in another toolkit, there are also bits you can use | 13:26 |
| awilkins | GaryvdM_work, I'll be using Java (either Swing or SWT) but I suspect there will be at least some logic I can reuse | 13:26 |
| GaryvdM_work | awilkins: feel free to ask if you need any pointers arround the code. | 13:26 |
| === mrevell-lunch is now known as mrevell | ||
| mrevell | bialix, That's a great idea ;) | 13:27 |
| bialix | mrevell: :-D | 13:27 |
| GaryvdM_work | :-O | 13:27 |
| bialix | lol | 13:28 |
| GaryvdM_work | bialix: Maybe look at http://www.graphviz.org/ , but not as nice as what ever created http://doc.bazaar-vcs.org/migration/en/foreign/bzr-on-svn-projects.html | 13:29 |
| bialix | no, dot is not nice, it require many manual tuning to get what I need in the order and layout I need | 13:30 |
| bialix | I mean WYSIWYG tool | 13:31 |
| GaryvdM_work | bialix: It seems igc has used inkscape to draw toughs graphs [http://bazaar.launchpad.net/~bzr/bzr-migration-docs/trunk/annotate/head%3A/en/_static/merge-with-parent.svg] | 13:45 |
| GaryvdM_work | bialix: I think we can learn from http://www.understated.co.uk/2008/how-we-write-launchpad-announcements/ | 13:48 |
| bialix | GaryvdM_work: thanks, it's interesting (about announcements) | 13:49 |
| bialix | I need to look at Inscape, never saw it in action | 13:49 |
| bialix | GaryvdM_work: btw, you're missing summary in your announcement/NEWS | 13:50 |
| GaryvdM_work | Sorry | 13:51 |
| bialix | np | 13:52 |
| bialix | I said this solely in the context of Relevant there http://www.understated.co.uk/2008/how-we-write-launchpad-announcements/ | 13:52 |
| bialix | btw GaryvdM_work, you don't need to send announcement to ru_bzr, because you're not member; I'm forwarding announcements myself anyway | 13:56 |
| GaryvdM_work | Bialix: ok | 13:57 |
| bialix | GaryvdM_work: so what about Bug 479093? Do you forgot to push or do you want me to test it first? | 14:09 |
| ubottu | Launchpad bug 479093 in qbzr "Treewidget: Can't revert from the context menu on windows" [Critical,Confirmed] https://launchpad.net/bugs/479093 | 14:09 |
| GaryvdM_work | bialix: ah - push failed | 14:11 |
| * GaryvdM_work rebases | 14:11 | |
| GaryvdM_work | bialix: pushed now | 14:13 |
| bialix | thx | 14:14 |
| bialix | GaryvdM_work: working OK, thx, NEWS? | 14:17 |
| GaryvdM_work | ok | 14:17 |
| bialix | interesting is it possible to teach bzr to understand recursive cbzr call, like: bzr bzr qci | 14:19 |
| GaryvdM_work | bialix: I think qsubprocess will do that | 14:33 |
| bialix | it was half/joke | 14:33 |
| GaryvdM_work | bzr qsubprocess "qsubprocess qci" | 14:34 |
| LarstiQ | do those arguments keep being passed on? | 14:34 |
| GaryvdM_work | bzr qsubprocess "qsubprocess 'qsubprocess qci'" | 14:34 |
| GaryvdM_work | LarstiQ: yes | 14:35 |
| LarstiQ | GaryvdM_work: yay:) | 14:35 |
| GaryvdM_work | and I think if you bencode it, you can do more than 3 | 14:36 |
| bialix | lol | 14:36 |
| smartgpx | GaryvdM_work: I think I've caught a problem with qbrowse in qbzr 0.16.0 - do you want to know about it here or as a bugreport on lp? | 14:39 |
| GaryvdM_work | smartgpx: Bug report is better - other wise I'll forget | 14:39 |
| smartgpx | OK | 14:39 |
| bialix | smartgpx: check the latest reports, today is bug day | 14:40 |
| smartgpx | Thanks - it was Bug #479068 | 14:42 |
| ubottu | Launchpad bug 479068 in qbzr "qcommit crashed if there is removed files" [Critical,Fix released] https://launchpad.net/bugs/479068 | 14:42 |
| fullermd | bialix: Oooh, bug day? Do you need help adding bugs? 8-} | 14:45 |
| bialix | fullermd: yes, please! | 14:47 |
| smartgpx | wrt Launchpad. Is it possible to UNsubscribe from bugs in which I no longer have an interest? | 15:40 |
| GaryvdM_work | smartgpx: #launchpad | 15:42 |
| bialix | smartgpx: yes | 15:49 |
| === nevans_ is now known as nevans | ||
| maxb | abentley: Hi. I filed a couple of MPs against bzrtools over the weekend. Is that sufficient or should I also be emailing the bzr ML? | 17:34 |
| abentley | maxb: that's sufficient. | 17:35 |
| maxb | thanks | 17:36 |
| dash | jelmer: is the wizard in? | 18:42 |
| dash | I have an svn repo where a branch was deleted and a new one was created with the same name | 18:43 |
| dash | i would like to get a bzr branch containing the branch that was deleted. | 18:43 |
| jelmer | dash: hey | 18:49 |
| jelmer | dash: easiest way to do that is to create a new branch that is a descendent of the disappeared branch | 18:49 |
| jelmer | dash: alternatively you can use svn-import --all and then use bzr heads --dead | 18:49 |
| dash | ah. | 18:52 |
| dash | i wondered if 'bzr get <url> -r svn:12345' or whatever would do it | 18:52 |
| dash | but apparently not | 18:52 |
| jelmer | dash: no, that won't work | 18:58 |
| jelmer | dash: perhaps we can support something like -rsvn:trunk@12345 though | 18:58 |
| dash | jelmer: i'll just svn cp for now | 19:04 |
| dash | no big deal. :) | 19:04 |
| dash | thanks again | 19:04 |
| jelmer | np | 19:04 |
| === GaryvdM_work is now known as GaryvdM | ||
| RenatoSilva | verterok: I want to use bzr-eclipse :( | 19:21 |
| verterok | RenatoSilva: hi | 19:21 |
| RenatoSilva | verterok: hi man, please please apply the patch :D | 19:21 |
| RenatoSilva | verterok: or tell me how to build a jar for bzr-java-lib :( | 19:22 |
| verterok | RenatoSilva: I'm really sorry about that...I wasn't able to find the root cause but I'm still getting test failures | 19:23 |
| verterok | RenatoSilva: just "mvn package" in bzr-java-lib | 19:23 |
| verterok | RenatoSilva: I can build bzr-eclipse with you'r patch applied if that's ok with you | 19:23 |
| RenatoSilva | verterok: the patch was for bzr-java-lib, iirc bzr-eclise wasn't chnaged | 19:25 |
| RenatoSilva | verterok: also for xmloutput, but this one I think you're merged all the work | 19:25 |
| verterok | RenatoSilva: I know, but I can build a bzr-eclipse zipped update-site so you can use that | 19:26 |
| RenatoSilva | verterok: also I would need redstone xml-rpc fixed, not sure how to do it though | 19:26 |
| verterok | RenatoSilva: do you have a patch for it? | 19:26 |
| RenatoSilva | verterok: an update site with the patched version? it would be really nice :) | 19:26 |
| verterok | RenatoSilva: this hudson instance is running in my desktop, so the uptime (and bandwidht) is quite bad: http://steppenwolf.selfip.net/hudson/ | 19:27 |
| verterok | RenatoSilva: I have a win32 slave in order to test all components in windows and linux | 19:27 |
| RenatoSilva | verterok: bug 388300, last comment | 19:29 |
| ubottu | Launchpad bug 388300 in bzr-xmloutput "Encoding problems in xmloutput: non-ascii URLs and ascii decoding of non-ascii strings" [High,Confirmed] https://launchpad.net/bugs/388300 | 19:29 |
| verterok | RenatoSilva: I have a branch that includes your patch + some fixes for win32 (only for the tests), http://steppenwolf.selfip.net/hudson/job/bzr-java-lib-xp%20%28encoding%20and%20tests%20fixes%29/changes | 19:29 |
| verterok | RenatoSilva: you can check the failing tests there ^ | 19:30 |
| verterok | RenatoSilva: actually, here: http://steppenwolf.selfip.net/hudson/job/bzr-java-lib-xp%20%28encoding%20and%20tests%20fixes%29/10/console | 19:30 |
| RenatoSilva | verterok: the test errors were not happening before the patch? isn't it related to the patch needed for redstone lib? | 19:33 |
| verterok | RenatoSilva: ok, so we need a patched redstone-xmlrpc? | 19:33 |
| verterok | RenatoSilva: don't know, let me check | 19:33 |
| RenatoSilva | verterok: see the bug 388300, lte me give you the exact comments.... | 19:34 |
| ubottu | Launchpad bug 388300 in bzr-xmloutput "Encoding problems in xmloutput: non-ascii URLs and ascii decoding of non-ascii strings" [High,Confirmed] https://launchpad.net/bugs/388300 | 19:34 |
| verterok | RenatoSilva: I'm looking at it and also the xmlrpc patch in sf | 19:34 |
| RenatoSilva | verterok: comments 18-22 | 19:35 |
| RenatoSilva | verterok: the redstone lib always declares the xml as utf-8, but does not decode/encode the actual xml data with that same encoding | 19:35 |
| verterok | RenatoSilva: I can patch redstone xmlrpc and use a patched version in bzr-eclipse if that's what we need | 19:36 |
| verterok | RenatoSilva: I'll apply your patch to redstone and fire a new buil/testrun as soon I get home today | 19:36 |
| RenatoSilva | verterok: linux developers (including them) don't notice the problem because utf8 is the default system encoding in Java | 19:36 |
| RenatoSilva | verterok: I think the patch in the LP bug (read encoding from a config) is better than the one there in SF (hard-coded) | 19:37 |
| RenatoSilva | verterok: http://launchpadlibrarian.net/28683665/xmlrpc_fix.diff | 19:37 |
| verterok | RenatoSilva: yes, or even accepting the value in the XmlRpcClient constructor | 19:37 |
| GaryvdM | Hi RenatoSilva | 19:38 |
| RenatoSilva | GaryvdM: hi | 19:38 |
| RenatoSilva | verterok: contructor? let me see | 19:38 |
| GaryvdM | RenatoSilva: I wanted to explain something to you yesterday, but your rebooted to quickly | 19:38 |
| GaryvdM | RenatoSilva: All though you can't work with a checkout on a NTFS dir from linux, you can work with the branch | 19:40 |
| RenatoSilva | GaryvdM: I didn't do a checkout | 19:40 |
| GaryvdM | RenatoSilva: So you can branch to a linux drive, work there, and when you are done, push back to the branch on the ntfs drive. | 19:41 |
| GaryvdM | RenatoSilva: A branch has a checkout by default, unless you say --no-tree | 19:41 |
| Adys | Is the lack of expansion of the ~ character on bzr+ssh a known bug? | 19:42 |
| RenatoSilva | GaryvdM: in windows, bzr diff returns nothing. I just go into the dir in Ubuntu, and bzr diff returns a lot of permission changes. Not sure what to do or how things should be, maybe the way Linux deals with NTFS should change | 19:42 |
| GaryvdM | RenatoSilva: maybe working tree is a better word than checkout | 19:42 |
| RenatoSilva | GaryvdM: hummmm, like bzr branch /ntfs /reiserfs, then bzr diff won't show any diff? then when I'm done I push to the original branch, and everything will be ok? | 19:43 |
| GaryvdM | Yes | 19:43 |
| RenatoSilva | verterok: wow there's a test there that took 39 years to run o.O | 19:49 |
| GaryvdM | RenatoSilva: the reason that it guesses +x is so that you can execute files. | 19:49 |
| verterok | RenatoSilva: heh | 19:49 |
| fullermd | Adys: 2.1 should support it. | 19:49 |
| RenatoSilva | GaryvdM: because ntfs does not have anything similar to +x, I see | 19:49 |
| verterok | RenatoSilva: looks like a silly bug in a hudson plugin | 19:49 |
| RenatoSilva | GaryvdM: it seems to me that it's really just that bzr should be aware about ntfs partitions, and ignore the +x bit | 19:50 |
| RenatoSilva | verterok: funny at least :) | 19:50 |
| GaryvdM | yes - not sure if that is possible. | 19:50 |
| RenatoSilva | GaryvdM: why not use -x for all files, then +x for .exe, .bat and all executable extensions. I think it's a better approach | 19:53 |
| * fullermd looks around his *nix system for 'executable extensions'... :p | 19:53 | |
| RenatoSilva | GaryvdM: I don't know even if any permission change in ntfs partitions should work | 19:53 |
| RenatoSilva | fullermd: ntfs partitions are not originally from *nix | 19:54 |
| GaryvdM | RenatoSilva: It doesn't. If you set it to -x, it just goes back to +x | 19:54 |
| RenatoSilva | fullermd: they're likely to contain windows stuff | 19:54 |
| RenatoSilva | GaryvdM: hum, so the point is not even about the +x, but that all the permission stuff is completely irrelevant | 19:55 |
| RenatoSilva | GaryvdM: I think maybe ntfs driver could use the partition metadata, or some meta file, to manage the permissions, separate from the windows ones. Or maybe create some adaption between them | 19:56 |
| RenatoSilva | GaryvdM: hum adaption would not be possible, I think it's no sense. It should be a separate permission management, but stored in the partition itself. It would be nice | 19:57 |
| RenatoSilva | verterok: Guillermo iirc bzr-java-lib passes all the tests here, or maybe 1 or 2 fail, but because of '\' x '/' (I've reported a bug about it) | 19:58 |
| bialix | sprinters start running | 20:13 |
| RenatoSilva | verterok: when I click the test links I get a timeout | 20:15 |
| verterok | RenatoSilva: yeap, me too :( | 20:15 |
| verterok | RenatoSilva: looks like there's something worng with the apache config | 20:15 |
| verterok | RenatoSilva: I'm trying to fix it ATM | 20:15 |
| vila | hello bialix, no not yet, I'm up early cause I couldn't sleep :-/ | 20:15 |
| bialix | hi vila | 20:16 |
| bialix | you're in Brisbane again? | 20:16 |
| vila | yup | 20:16 |
| RenatoSilva | verterok: so let me understand, there's bzr-java-lib, and bzr-java-lib + my-changes, and bzr-java-lib +my-changes + your-changes-to-my-changes? | 20:16 |
| bialix | understand | 20:16 |
| fullermd | Sleep is for wimps anyway. | 20:16 |
| verterok | RenatoSilva: nope, only bzr-java-lib and bzr-java-lib + my changes + your changes | 20:17 |
| vila | where I can sign to be a wimp ? | 20:17 |
| verterok | RenatoSilva: but I can setup a job for your branch | 20:17 |
| verterok | RenatoSilva: once I fix the apache issue :/ | 20:17 |
| RenatoSilva | verterok: but why sin't my-changes there in LP, only in your local server? | 20:17 |
| fullermd | Pshaw. You start sleeping, next thing you know you'll be expecting to eat too. | 20:17 |
| vila | oh ! Good idea, didn't have dinner yesterday, I should go out and find some breakfast :) | 20:18 |
| RenatoSilva | verterok: that tool, hudson is for continuous integration, right? Not very familiar with that, my co-workers don't even do unit testing you know | 20:18 |
| verterok | RenatoSilva: https://code.edge.launchpad.net/~verterok/bzr-java-lib/encoding-and-test-fixes | 20:19 |
| verterok | RenatoSilva: ^ my changes + your changes | 20:19 |
| verterok | RenatoSilva: yes, I have a winxp slave so I don't have to run the tests manually in windows ;) | 20:19 |
| GaryvdM | bialix: for lp:~craighewetson/qbzr/qrevert, command line files - no longer work - I try figure out a way to get arround this. | 20:20 |
| RenatoSilva | verterok: ok, so at the same time I was doing fixes separate from trunk, you were doing too, ok. So which test failures were due to trunk, to your changes, to mine, and to our? Do you have this data? | 20:20 |
| verterok | RenatoSilva: my changes are just test fixes (the / vs \ thingy in windows) | 20:21 |
| verterok | RenatoSilva: but let me setup you branch (wihtout my changes) as a hudson job so we have some real data :) | 20:22 |
| RenatoSilva | verterok: well iirc the \x/ was the only test failures, if you fixed them then trunk + your changes should pass all the tests, mine will break because of \x/ which is fixed only in your branch | 20:23 |
| bialix | GaryvdM: ok | 20:26 |
| * bialix trying to merge patches for bzr-explorer | 20:26 | |
| bialix | why ubottu don't provide handy links for lp branches? | 20:26 |
| RenatoSilva | verterok: yes the \x/ is with bzr-java-lib: bug 399000 | 20:27 |
| ubottu | Launchpad bug 399000 in bzr-java-lib "Test failures on Windows" [Medium,Confirmed] https://launchpad.net/bugs/399000 | 20:27 |
| luke-jr | any way to get irclogs.ubuntu.com edited? | 20:29 |
| RenatoSilva | verterok: taking a look at http://steppenwolf.selfip.net/hudson/job/bzr-java-lib-xp%20%28encoding%20and%20tests%20fixes%29/org.vcs.bazaar.client$bzr-java-lib/10/console | 20:32 |
| RenatoSilva | verterok: I think it may be encoding problem | 20:32 |
| RenatoSilva | verterok: maybe with the redstone lib | 20:34 |
| spirov92 | hi, i | 20:34 |
| spirov92 | oops | 20:34 |
| verterok | RenatoSilva: yes, now that you pointed me the patch, it might be | 20:34 |
| spirov92 | i'm embedding a checkout of module1 inside of project1, how can I make bzr upload upload the module too? | 20:35 |
| RenatoSilva | verterok: if you can debug, just check redstone's XmlRpcClient, see if the patch is apllied to it | 20:38 |
| spirov92 | god bless bash, i found a way: for file in $( find . -name .bzr ); do bzr upload -d $file $path/${file%/.bzr}; done; | 20:54 |
| verterok | RenatoSilva: http://steppenwolf.selfip.net/hudson/job/bzr-java-lib-xp%20%28encoding%20fixes%29/ws/bzr-java-lib/target/surefire-reports/ | 20:55 |
| verterok | RenatoSilva: those are the test results of your branch :) | 20:56 |
| RenatoSilva | verterok: asks user/pwd | 20:56 |
| verterok | RenatoSilva: yeap ;) | 20:56 |
| spiv | Good morning. | 22:04 |
| jelmer | spiv: moin | 22:18 |
| === mfer_ is now known as mfer | ||
| Amything | hey, I'm a lone developer scared of complicated version control :) looking for some help... my situation is... | 23:02 |
| Amything | I have installed Bazaar, I want to have master copy of my project on a mapped network drive, and I want to work on my project on my local hard drive | 23:03 |
| dash | sounds reasonable | 23:03 |
| Amything | I have my files on the network drive at h:\www, do I initialize a project there then? | 23:04 |
| dash | 'bzr init' | 23:04 |
| Amything | I was hoping to do this with the GUI :) | 23:04 |
| Amything | should I go to console? | 23:04 |
| dash | which gui? | 23:04 |
| Amything | Bazaar Explorer | 23:04 |
| dash | ah. never used that, sorry. | 23:05 |
| Amything | ok, I would really like you help anyway, I'll use console | 23:05 |
| GaryvdM | click on start new project in bzr explorer | 23:05 |
| GaryvdM | and then Initialize | 23:06 |
| Amything | ok done | 23:06 |
| GaryvdM | And the browse and select h:\www | 23:06 |
| Amything | ok done | 23:06 |
| GaryvdM | plain branch | 23:07 |
| === AnMaster is now known as _[] | ||
| Amything | ok | 23:07 |
| * GaryvdM notes that bzr qinit has changed! | 23:07 | |
| GaryvdM | and ok | 23:07 |
| Amything | ok its working... | 23:07 |
| Amything | hmm maybe I should have added my huge image directory to the ignore list | 23:07 |
| GaryvdM | You will still have a chance to do that | 23:08 |
| Amything | ok great | 23:08 |
| RenatoSilva | Amything: bzr init just inits the repo, your repor does not contain anything yet | 23:08 |
| RenatoSilva | Amything: you have to bzr add, to add all of them, or bzr add files/dirs | 23:09 |
| GaryvdM | Then you go to "Open an existing location" | 23:09 |
| Amything | ah ok | 23:09 |
| GaryvdM | and open | 23:09 |
| Amything | its still doing something | 23:09 |
| RenatoSilva | Amything: bzr ignore <pattern> to ignore your images | 23:09 |
| Amything | ok finished | 23:09 |
| RenatoSilva | Amything: are you sure you don't want to version control your images? They won't be in your repo | 23:10 |
| Amything | they come and go quite rapidly in my testing, wont that slow things down? | 23:10 |
| Amything | lets just try it | 23:11 |
| Amything | better safe than sorry | 23:11 |
| GaryvdM | Amything: I version my images for the websites that I do. | 23:11 |
| dash | if you have rapid change of large binary files, you might want to find something other than bzr to manage those with. | 23:11 |
| Amything | yeah I have several thousand images in there | 23:11 |
| dash | but it probably depends on what "rapid" and "large" mean :) | 23:11 |
| GaryvdM | Amything: go to "Open an existing location" | 23:12 |
| GaryvdM | and click on open | 23:12 |
| Amything | Searching for that one still | 23:12 |
| Amything | ok got it | 23:12 |
| RenatoSilva | thousand images? what's that? | 23:12 |
| Amything | its bunch of company logos | 23:13 |
| Amything | and pictures of there location as well | 23:13 |
| GaryvdM | Amything: tell me when you see "Working tree is up to date at revision 0." | 23:13 |
| Amything | before doing "Open existing locatoin" ? | 23:14 |
| Amything | I have: Working tree differs from revision 0. | 23:14 |
| Amything | in my www(H:/) tab | 23:14 |
| === _[] is now known as []_ | ||
| GaryvdM | Good, now click Commit | 23:15 |
| Amything | ok | 23:15 |
| Amything | write message and ok? | 23:15 |
| GaryvdM | Tick "Show non-versioned files" | 23:15 |
| Amything | looks good | 23:15 |
| Amything | see my fiels | 23:15 |
| Amything | files | 23:15 |
| GaryvdM | And tick the files you want to add. | 23:15 |
| GaryvdM | And you message can be something like "Initial Commit" | 23:16 |
| Amything | Will all subfolder come along? | 23:16 |
| GaryvdM | Oh yea, that can be painfull | 23:16 |
| GaryvdM | Cancel the commit dialog | 23:16 |
| GaryvdM | and go into add | 23:17 |
| GaryvdM | That is better at adding whole dirs. | 23:17 |
| Amything | ah ok | 23:17 |
| Amything | working... | 23:17 |
| GaryvdM | You can add from commit, but it's only good for odd single files. | 23:18 |
| Amything | ok | 23:18 |
| RenatoSilva | Amything: you should not ignore the images just because they're many and/or big | 23:18 |
| Amything | yeah I inclued them | 23:18 |
| GaryvdM | Amything - so you can choise not not add your images from the add dialog | 23:18 |
| RenatoSilva | Amything: but because they are not part of your versioning, and I suspect they are | 23:18 |
| GaryvdM | you dont have to ignore them | 23:18 |
| Amything | taking some time | 23:18 |
| GaryvdM | RenatoSilva: It's easy with bzr-explorer/qbzr to not add a dir without ignoring it. | 23:19 |
| GaryvdM | RenatoSilva: but lets say you don't want to add *.pyc file - that should be done with ignore | 23:20 |
| RenatoSilva | GaryvdM: either ignored or unknown, I mean he wants to ignore the images | 23:20 |
| * Kilroo1 sighs. | 23:21 | |
| Kilroo1 | I really need to try to set up a Windows build environment. | 23:21 |
| RenatoSilva | GaryvdM: and I suspect he should not ignore (no bzr add / bzr ignore) | 23:21 |
| GaryvdM | Amything: Normaly things like add are very quick, but I think they are slow for you because you are doing this on a network drive. | 23:22 |
| Amything | ok | 23:22 |
| Amything | its around 400 meg as well | 23:22 |
| GaryvdM | RenatoSilva: No - Thats what I'm saying - He does not need to ingore the images folder, just not add it. | 23:22 |
| RenatoSilva | GaryvdM: what I mean is that maybe he shoud add them | 23:23 |
| Amything | maybe I should cancel and just not add it while we do this? | 23:23 |
| GaryvdM | Ok | 23:23 |
| GaryvdM | Amything: Do you have the same dir on you local drive? | 23:24 |
| Amything | yes | 23:24 |
| RenatoSilva | Amything: could you explain what is your sofware and the relation with your imgs? | 23:24 |
| === []_ is now known as {}_ | ||
| GaryvdM | Amything: Lets frist create the branch on you local drive, and then push it to the server | 23:24 |
| GaryvdM | *first | 23:24 |
| Amything | I'm exporting images from a database binary field into my filesystem | 23:25 |
| GaryvdM | Then they def should not be versioned | 23:25 |
| Amything | yeah I will just do that when I go live I think | 23:26 |
| Amything | so I will cancel right? | 23:26 |
| GaryvdM | yes | 23:26 |
| Amything | and close the www(H:/) tab and delete the .bzr files? | 23:26 |
| GaryvdM | Amything: are you on windows or linux | 23:26 |
| Amything | windows | 23:26 |
| GaryvdM | oh h: - windows | 23:26 |
| GaryvdM | Amything: yes | 23:27 |
| Amything | ok done | 23:27 |
| Amything | and repeat with local | 23:27 |
| GaryvdM | Cool - Do the sames steps on you local folder. | 23:27 |
| RenatoSilva | Amything: does your software rely on any expected value for the images? | 23:28 |
| Amything | not really | 23:28 |
| RenatoSilva | Amything: that is, there should be an image called abc in dir xyz, and the image should be a dog or a mail icon etc | 23:29 |
| RenatoSilva | Amything: if not, then what's the relation bewteen your sofware and the imgs at all | 23:29 |
| Amything | they are just used on a web page with img tag, no big deal if they are missing | 23:30 |
| RenatoSilva | and what does this have to do with your sofware at all? | 23:30 |
| Amything | when I go live I need to deploy these images to the server, but in testing they dont play any role | 23:31 |
| RenatoSilva | your software is the web site? | 23:32 |
| Amything | yes its a php project | 23:33 |
| RenatoSilva | ah ok | 23:33 |
| Amything | Committing... | 23:35 |
| Amything | Finished | 23:35 |
| GaryvdM | Much quicker local | 23:35 |
| Amything | Still get "? Working tree differs from revision 1." | 23:35 |
| Amything | what could that be | 23:35 |
| GaryvdM | What do you see if you click "Diff" | 23:36 |
| Amything | No changes found | 23:36 |
| Amything | still shows msg after refresh | 23:36 |
| Amything | ah ok its the directory I skipped | 23:36 |
| GaryvdM | Dose it say anything under "Working tree differs from revision 1"? | 23:36 |
| Amything | yes | 23:37 |
| Amything | Unversioned (1) ? | 23:37 |
| Amything | ? finna/files | 23:37 |
| Amything | which is my skip folder | 23:37 |
| GaryvdM | Ok - thats ok | 23:37 |
| Amything | cool | 23:37 |
| GaryvdM | Hmm - now the folder that you want to keep this branch, allready contains the file. | 23:38 |
| GaryvdM | That is going to cause conflicts when you try push there | 23:39 |
| Amything | I see | 23:39 |
| GaryvdM | I may be eaiser to push do a different place. | 23:39 |
| GaryvdM | *do=>to | 23:39 |
| Amything | so now when I work on my project locally and make a change I'm happy with, I commit it and the push it to the network drive correct? | 23:40 |
| GaryvdM | yes | 23:40 |
| Amything | you think the files folder will be in the way of this? | 23:41 |
| GaryvdM | Or just push there (h:\www), and then do del h:\www\*.moved /s | 23:41 |
| GaryvdM | Amything: no, this is just something you have to overcome initialy | 23:41 |
| RenatoSilva | what kind of partition is your network dirve? | 23:41 |
| Amything | hmmm its a Windows 2000 server, not sure about the details | 23:42 |
| GaryvdM | RenatoSilva: that won't matter. Different to what you were doing | 23:42 |
| RenatoSilva | GaryvdM: that would matter if it was Netware :P | 23:43 |
| Amything | how do I push to the network drive? | 23:43 |
| Amything | console? | 23:43 |
| RenatoSilva | bzr push <target> | 23:43 |
| GaryvdM | RenatoSilva: Ok - I see | 23:43 |
| GaryvdM | Amything: Collaborate -> Push | 23:43 |
| GaryvdM | Or F6 | 23:44 |
| RenatoSilva | GaryvdM: bug 452625 | 23:44 |
| ubottu | Launchpad bug 452625 in bzr "No such file errors in Netware filesystems" [Undecided,New] https://launchpad.net/bugs/452625 | 23:44 |
| Amything | pushing... :) | 23:45 |
| GaryvdM | Amything: Sorry - I must go to bed. It's 1:47 in the morning | 23:48 |
| Amything | ok thanks for all the help, save me a bunch of time | 23:48 |
| Amything | thanks again | 23:48 |
| GaryvdM | Pleaser | 23:48 |
| GaryvdM | Amything: once you have pushed, you will probably get lots of duplicate conflicts. | 23:48 |
| Amything | yeah I was getting some errors, trying something now | 23:49 |
| Amything | had the old files there, so I'm deleting them now | 23:49 |
| Amything | start with empty directory | 23:49 |
| GaryvdM | Ok - that will work as well. | 23:50 |
| GaryvdM | Ok night. | 23:50 |
| Amything | gn | 23:50 |
| Amything | bzr: ERROR: [Errno 22] Invalid argument | 23:54 |
| Amything | hmmmmmm | 23:54 |
| Amything | try using cmd line | 23:55 |
| Amything | same | 23:57 |
| Amything | hmm works locally | 23:59 |
Generated by irclog2html.py 2.7 by Marius Gedminas - find it at mg.pov.lt!
![http://bazaar.launchpad.net/~bzr/bzr-migration-docs/trunk/annotate/head%3A/en/_static/merge-with-parent.svg]](http://bazaar.launchpad.net/~bzr/bzr-migration-docs/trunk/annotate/head%3A/en/_static/merge-with-parent.svg]){kind=link}