/srv/irclogs.ubuntu.com/2007/12/18/#bzr.txt

thumperjam: thanks00:01
mindstormshi everybody! a friend told me that there should be a .dmg for the bzr 1.0 distro00:15
mindstormsI have found it here http://phanatic.hu/bzr/mac/, but it looks like it is only for Leopard00:16
mindstormsdo you know if there is any packaged distro for Tiger?00:16
mindstormstia00:16
mneptokmindstorms: use MacPorts00:28
mindstormsmneptok: thanks. I am aware of this option, but I currently don't have XCode installed00:29
mindstormsso it would require me to pass through quite a few hops just to get bzr working on my sys :(00:30
mindstormsthat's the reason I would have preferred a packaged distro (and considering there is one for Leopard I don't think it will be so difficult to get one)00:31
mneptokmindstorms: you're not using bzr for source code management?00:31
mindstormsthat's my intention indeed00:32
mneptokbecause if that's your planned use case, it seems odd not to have XCode installed.00:32
mindstormsI00:32
mneptok*shrug*00:32
mindstormsI am mostly developing on java00:33
mindstormsplus some perl/python/ruby00:33
mindstormsnone requires xcode00:33
mneptokah.00:33
mindstormsso... I'll probably wait to 1/ either a packaged bzr will become available for Tiger00:34
mindstorms2/ more things will require me to install XCode00:34
mneptoki think 2 is a certainty00:34
mindstormsso far I've managed not to install it... so I'm pretty tough here00:35
mindstormsso frankly speaking i hope 1/ is the option ;-)00:35
pooliemindstorms, Tiger is the new one, right?00:36
mneptokpoolie: Leopard is00:36
mindstormsTiger=10.4, Leopard=10.500:36
mneptokpoolie: Tiger is OSX.4, and prolly has a fairly old version of Python by default00:37
mindstormsI think it comes by default with 2.300:37
mneptokmindstorms: and that will cause you to need XCode/MacPorts00:37
mindstormsbut I'm currently using 2.5.100:37
mneptokmindstorms: supplied by Apple in a sysyem update?00:37
mindstormsmneptok: I don't see any relationship between python version and xcode?00:37
mneptok*system00:37
mindstormsnope... why would that be needed?00:38
mathrickhiya, a question that arose on #gnome-hackers, can you do cvsimport without shutting down the repo?00:38
pooliethe cvs repo00:38
poolieyes, i think so00:38
mneptokmindstorms: if bzr requires a newer Python than Apple currently ships as part of the OS, XCode/MacPorts becomes necessary to get the newer Python00:38
mathrickas in, while still being to commit while it's importing00:38
pooliemindstorms, how about just installing from the tarball?00:38
mathrickand sync it afterwards00:39
mindstormsmneptok: I don't think you are correct about it00:39
poolienot every importer can do incremental syncs00:39
pooliemindstorms, i think what he's getting at is that00:39
spivmathrick: I believe cscvs can do that.  Not sure about other importers (like Tailer).00:39
pooliea dmg may be built assuming you're using the system python00:39
spivEr, "Tailor"00:40
mindstormsif my environment is correctly setup, bzr should firstly find the configured python00:40
pooliemindstorms, how about just installing from the tarball?00:40
pooliei don't think that would need anything beyond a recent python?00:40
mindstormspoolie: there are quite a few dependencies00:40
mathrickspiv: can you use it to migrate to bzr?00:40
mindstormsincluding the c library00:40
mindstormsthat means that I would need to build it locally => I need to install XCode00:41
mindstormswhich is what I was trying to avoid :)00:41
mneptokmindstorms: and you trust "some guy who can make a .dmg" more than MacPorts to account for and solve such dependencies? ;)00:41
spivmathrick: yes00:41
mindstormswhy wouldn't I?00:41
mneptokmindstorms: uh ...00:41
pooliemneptok, you're not totally helping here00:41
spivmathrick: if it's a public CVS repository you could get Launchpad to try mirror it to bzr for you.00:42
mindstormsshould I trust somebody and use bzr or just pay for whatever other thing I can pay for00:42
mneptokpoolie: i'm trying to understand the reticence in installing Apple's developer tools in order to use a developer tool. :)00:42
mindstormsso I don't thin it is a matter of trust that should be involved here00:42
mindstormsmneptok: it is simple 1GB + time00:42
pooliemindstorms, afaik the compiled extensions are optional00:43
pooliei agree it would be nice to have a dmg built for older systems00:43
mathrickspiv: it's not00:43
mathrickit's about a company repo00:43
mindstormspoolie: I think you might be right... because for those it is said: recommended00:43
pooliebut i'm just trying to work out if there's anything else problematic about using the tarball?00:43
pooliethey will make it faster00:44
mathrickand launchpad or not, it doesn't really matter, if launchpad can do it, so can anyone else00:44
mathrickI'm interested in the method, really00:44
mindstormspoolie: which is quite important, but I think I can live with it till somebody will create the dmg00:44
mneptokmindstorms: why not try the tarball, and rm it if it misbehaves or does not play nicely under Tigert?00:44
mneptok-t00:44
mindstormsmneptok: cause initially it was my understanding that there are some external dependencies00:45
pooliemindstorms, there was a recent thread about this00:45
spivmathrick: launchpad uses cscvs under the hood for cvs->bzr00:45
poolie"improved installation experience" etc00:46
mneptokmindstorms: right. but if they cause problems, only then remove. it may be that your use cases are addressed without relying on the functionality of compiled extensions.00:46
mindstormspoolie: it is not clear that those are optional in fact00:46
mindstormsI've rechecked the page here: http://bazaar-vcs.org/InstallationFaq00:46
mathrickspiv: aha, cool00:46
pooliemindstorms, what page/file are you looking at?00:46
poolieok00:46
mathrickI thought cvscs was for Arch only00:46
mindstormsand those are listed as dependencies00:47
pooliemindstorms, so, in that thread00:47
poolieit looks like people concluded "if we make a Tiger dmg, it'd need to include python2.5"00:47
pooliei think the general expectation is that dmgs should be totally self contained00:48
mindstormsdarn i'm tired00:48
pooliebut you think we should do one which requires/assumes you already installed python?00:48
pooliethat could make sense00:48
mindstormscElementTree: it's been made part of the standard library in python 2.500:48
mindstormsstupid me.... and playing at 3am00:48
poolienp00:49
igcpoolie: I think out Tiger dmg should assume python 2.5 is already installed00:49
mindstormspoolie: I think the installer should just look for python in the path00:49
igcs/out/our/00:49
mindstormsand check the version00:49
spivmathrick: https://launchpad.net/launchpad-cscvs/00:49
mindstormsit looks I should probably be able to run it right from the distro00:50
mathrickspiv: ah, nifty00:50
mindstormsas I'm only missing the python dependencies which i guess can be easily installed00:50
mneptokpoolie: IIRC, Apple installers can be made to require dependencies. so an installer could check for >py2.5.x00:51
mindstormshowever, I do think that a packaged distro would make the user experience a hell lot nicer ;-)00:51
* mneptok hasn't done any Apple .pkg stuffs in a loooong time00:52
poolieif you have python2.5 you should not need anything else.00:52
pooliei'm going to follow up to that thread00:52
mindstormsI think I've mentioned that I have the 2.5.1 installed00:52
pooliepm me your email address if you want me to cc you00:52
mindstormsthanks guys00:54
mneptokbah. i guess dep-checking isn't handled by packagemaker - http://developer.apple.com/documentation/Darwin/Reference/ManPages/man1/packagemaker.1.html00:57
mneptokwe curses it.00:57
* spiv -> lunch01:01
=== mw is now known as mw|out
orospakrHey, when is bzr 1.0 likely to show up in gutsy backports?01:40
orospakrI should I just load the debs from hardy?01:40
orospakrnope, hardy debs are no good on gutsy.01:48
orospakrlibc6 version dep not met.01:48
orospakroh well, building from source.01:48
* igc lunch01:55
orospakroh, can I get coloured output from bazaar, too?01:56
orospakrie, bzr status, bzr log, etc.01:56
orospakrmakes things much more readable.01:56
bob2you can install bzrtools and get cdiff02:00
orospakrwell, that's good, but that's only for diffs02:01
abentleybob2: long time, no see.02:03
=== BentBriar_ is now known as BentBriar
=== jamesh__ is now known as jamesh
ubotuNew bug: #177080 in bzr "code coverage unclean" [Undecided,New] https://launchpad.net/bugs/17708005:45
* igc dinner07:03
lifelesspoolie: right, one itch scratched. (See my just-sent merge)07:37
lifelesspoolie: the error you got was because you used a lower version than ubuntu has.07:55
poolieand the "Signer has no rights?"07:56
poolieis that just a knock-on effect?07:56
lifelessdunno08:01
=== Dunearhp_ is now known as Dunearhp
zerokhi :-) am I blind or doesn'T there yet exist a bzr 1.0 package (newer than rc1 ) in the gutsy apt source?12:26
spivzerok: there's a 1.0 package in https://launchpad.net/~bzr/+archive now, but the bazaar-vcs.org archive hasn't been updated yet.12:30
zerokspiv, ah ok :) tnx :)12:30
lifelessno guarantee the ppa will be updated regularly or anything though, AIUI poolie is just fiddling12:34
lifelessYMMV12:34
lifelessnight12:34
spivlifeless: g'night12:35
zerokstrange ... now i've clearly modified a file but for some reason it doesn't show up with `bzr status` :-/12:58
zerokO_o `diff` died ...13:02
zerokarghhhhh where is my code O_o13:04
AfCAre you ignoring it? Try `bzr ignored`13:09
AfCAnd regardless of what Bazaar thinks, your file and your modifications are your business. It won't touch the file on disk unless you a) `revert` or b) `merge`, but the former case leaves backups, and the latter reports conflicts, if present.13:10
fullermdIt's not dead, it's resting.13:10
zerokAfC, i'm currently not even sure anymore, where my files are ;)13:10
zerokhad probably nothing to do with bzr :-)13:10
AfCfullermd: Indeed :)13:10
zeroksomethign really weird was going on here ;)13:11
alienzxI am fleshing out a plan to move from Subversion to bzr and was wondering if anyone had thoughts on how to handle a svn:externals situation14:08
alienzxThe project is a Rails website with a front and backend that share a common set of models, so inside /frontend/app/models is set to svn:external /backend/app/models, would I be able to make app/models into a 3rd bzr project and yet somehow still check it out into the proper place on the frontend and backend?14:10
mtaylorbzr: ERROR: bzrlib.errors.NoSuchRevision: Branch <bzrlib.plugins.svn.revids.RevidMap object at 0x1412610> has no revision monty@inaugust.com-20071218140922-2p0p7z3s1i61eo7a14:13
mtaylorso, this may not be something I can do...14:13
mtaylorbut I've got a bzr repository that's a collection of branches of an upstream svn repos14:13
mtaylorI created a branch in my bzr repos, which works fine14:13
mtaylorbut I wanted to push the branch, thereby creating a branch upstream.14:14
mtaylorbut that didn't so much seem to work - giving the above error14:14
mtayloram I just trying too much?14:14
mtaylorjelmer: ^^14:14
jelmeralienzx: there is experimental support in Bazaar for a feature called by-reference nested-trees, which are similar to svn:externals14:16
jelmermtaylor, Try svn-push14:16
jelmerrather than push14:16
mtaylorjelmer: ok14:16
mtaylorjelmer: btw, doing a normal push to an already existing svn repos has been working _beautifully_!14:17
jelmergood to hear :-)14:17
alienzxjelmer : thanks, I'd screw something up by checking out a bzr project within a subdirectory of another bzr project I take it?14:19
alienzxwithout using nested-trees14:19
jelmeralienzx, no, that should work14:19
alienzxcool, guess I'll find out soon enough :)14:20
mtaylorjelmer: bzr svn-push worked. thanks!14:22
spivjelmer: where do you push your bzr-svn commits to?  I want to play with your memory leak improvements :)14:29
jelmerspiv: http://people.samba.org/bzr/jelmer/bzr-svn/0.4/14:37
=== mw|out is now known as mw
Zindarjelmer: have you tried building bzr-svn on mac?14:52
ZindarI'm trying while waiting for other things14:53
mwhudsoni have14:53
mwhudsonit was horrific14:53
Zindarthat's my impression as well14:53
Zindar:(14:53
mwhudsonZindar: are you on ppc or intel?14:53
Zindarintel14:53
mwhudsonZindar: i presume you mean "building a sufficiently patched copy of the subversion python bindings"14:54
Zindarcorrect14:54
mwhudsoni managed to get it to work on powerpc after a lot of swearing14:54
mwhudsonhow far along are you?14:54
mwhudsonyou need a very precise version of swig14:55
Zindarmake swig-py :)14:55
ZindarI have 1.3.2714:55
Zindarthat should work14:55
mwhudsonand iirc to replace the version of libtool in the subversion tarball14:55
ZindarOH14:55
Zindarreally?14:55
Zindarwhy's that?14:55
mwhudsonZindar: one lazy option is to install ubuntu in parallels....14:55
mwhudsonZindar: i don't remember14:55
mwhudsonZindar: what errors are you getting at the moment?14:56
ZindarI get this strange thing in configure of svn...14:56
Zindarchecking for apr_int64_t Python/C API format string... rm: conftest.dSYM: is a directory14:56
ZindarL14:56
mwhudsonwhisky tango foxtrot14:56
Zindarhmm.. none really.. I get through the building of svn.. and install.... and swig-py-install as well14:56
alienzxugh, yeah won't be going down that path14:57
alienzx:)14:57
mwhudsonZindar: and then what?14:58
Zindarbut I install in a specific build_root... then I set PYTHONPATH and LD_LIBRARY_PATH...14:59
Zindarand then bzr-svn dies with "wrong version of bindings" or something14:59
jelmerzindar: and this is subversion 1.5 or 1.4 patched?14:59
Zindar1.4 patched15:00
Zindarit builds quite happily.. except the strange thing above.. but seems to build...15:01
Zindarperhaps I'm not setting some path right15:01
Zindar>>> import svn.delta15:01
Zindar>>> hasattr(svn.delta, 'svn_delta_invoke_txdelta_window_handler')15:01
ZindarFalse15:01
mwhudsonright15:02
mwhudsonsvn.delta.__file__ ?15:02
Zindar??15:03
mwhudsonwhat is that?15:03
Zindarthat's what bzr-svn runs to verify correct svn bindings15:03
mwhudsonare you sure you're importing the version of the bindings you think you are?15:03
Zindarnot 100% sure no....15:03
ZindarI'm a perl and ruby guy.. not python...15:04
mwhudsonso run15:04
mwhudsonimport svn.delta15:04
mwhudsonprint svn.delta.__file__15:04
mwhudsonin a python prompt15:04
Zindarahh15:04
Zindargreat15:04
Zindarno.. wrong one15:04
Zindarhmm15:04
Zindarok...15:05
Zindargot the right one15:05
Zindarstill False15:05
mwhudson:(15:06
mwhudsonsomething that can happen here15:06
Zindarit might be using the wrong compiled binary libraries I guess?15:06
mwhudsonis that iirc the processing of the swig files can fail, but you can still build the bindings from the c files that are included in the tarball15:07
Zindarok15:07
mwhudsonso maybe delete the built extensions in your build dir15:07
mwhudsonand the c that's generated from the swig15:07
mwhudsonand try again?15:07
mwhudsonit's a long time ago that i fought with this :/15:07
Zindar:)15:08
Zindarhmm.. I would expect to see "invoke_txdelta" somewhere in delta.py15:12
Zindarwouldn't I?15:12
Zindarit's in svn_delta.i... but not the svn/delta.py15:13
MattCampbellIn response to the bug report I filed yesterday in launchpad-bazaar, someone suggested that I downgrade to bzr 0.92.  I'm currently running bzr 1.0rc3 and created a branch in the default format for that version.  So do I need to do anything special with that branch when downgrading to 0.92?16:02
beunoMattCampbell, no, 0.92 supports the new pack format16:04
beuno(it's calles pack-0.92 after all  :p)16:04
PengOoh, auto-pack of bzr.dev's repo just added an 800 KB pack, a 15 KB one, 200, and 240.16:05
MattCampbellHow likely is it that bzr 1.0 on the client side would be incompatible with a smart server running bzr 0.92?16:11
beunoMattCampbell, seems unlikely to me, but I can't say for sure, haven't played with smart server in a while16:15
MattCampbellThe error that I got when trying to commit to a branch on LP yesterday, for which I filed a bug in launchpad-bazaar, has led me to question the maturity of bzr.16:25
MattCampbellwhich is why I'm asking so many questions now.16:26
beunoMattCampbell, as away  :D16:27
beunowe've all been using it in all kinds of enviroments for a long time now16:27
MattCampbellI presume you meant "ask away"16:28
beunoMattCampbell, would you have the bug numer around?16:28
beunoMattCampbell, ah, yes I did  :D16:28
beunowe16:28
beuno"bug number"16:28
beunokeyboard hates me today16:29
MattCampbellbug 17697816:29
jambug #17697816:29
jamubotu: bug #17697816:30
ubotuLaunchpad bug 176978 in launchpad-bazaar "Error when trying to commit to a central branch via smart server" [Undecided,New] https://launchpad.net/bugs/17697816:30
jamslow today16:30
MattCampbellI was trying to trigger a response from ubotu but didn't know the format.  I'm really new here.16:30
jamMattCampbell: I would have thought it would trigger from what you did16:31
jamMattCampbell: that is a known bug in the 0.92 smart server16:31
jamfixed in 1.016:31
MattCampbellIt should; that would only involve a slight regex tweak.16:31
MattCampbellOK, then I guess I'll switch to sftp.16:31
jambug 16113116:32
ubotuLaunchpad bug 161131 in bzr "dirstate file gets damaged by commit() in a merge when there are 2 deletes in a directory." [Critical,Fix released] https://launchpad.net/bugs/16113116:32
jambug 17697816:32
ubotuLaunchpad bug 176978 in launchpad-bazaar "Error when trying to commit to a central branch via smart server" [Undecided,New] https://launchpad.net/bugs/17697816:32
jamMattCampbell: maybe it just doesn't like you :)16:32
jamI'm guessing it was actually just being slow16:32
MattCampbelljam: Thanks for your help.  Someone should close my bug as a duplicate.16:33
jamI'm searching for it now16:33
jam(I was just testing the bug tracker with the bug I mentioned first :)16:34
jamMattCampbell: I'm not in launchpad-bazaar group, but I gave the link in the bug report16:34
jamI guess I can set it to duplicated :)16:40
ubotuNew bug: #176978 in launchpad-bazaar "Error when trying to commit to a central branch via smart server (dup-of: 156546)" [Undecided,New] https://launchpad.net/bugs/17697816:46
MattCampbellhuh?16:48
MattCampbellWhy did that one just get reported as a new bug?16:48
jamMattCampbell: because 'bzr' bugs are reported here while 'launchpad-bazaar' ones are not16:49
jamThis is newly marked as a duplicate of a 'bzr' bug16:49
jamIt shouldn't really claim 'New bug:' though16:49
mgedminso, would it be an incredibly stupid idea to run 'bzr init .' inside a directory mounted with davfs2 from a webdav server?17:36
MattCampbellIf you did that, then you'd have a working copy on the WebDAV server.  Do you really want a shared working copy?17:38
mgedminwhat I want is a versioned Zope 2 TTW website17:42
mgedmin(TTW is Zope-jargon for Though The Web, implying that you can edit it with a web browser)17:43
MattCampbellbzr would be no good for that, because the TTW edits wouldn't be committed to the bzr branch.17:44
mtaylormgedmin: you'd need to write a zope zodb hook to commit to the branch17:44
mtaylormgedmin: but writing a bzr product for zope would probably be pretty cool17:45
MattCampbellAnd doesn't Zope 2 have its own versioning?17:45
mtaylorit does17:45
mgedminthat's like saying vi is no good because it doesn't know how to commit17:45
* mtaylor thinks vi is no good because it doesn't know how to commit :)17:45
mgedminzope 2 built-in versioning is a silly toy17:45
PengDoesn't emacs know how to commit?17:46
mtaylorPeng: yup17:46
MattCampbellwith bzr?17:46
mgedminTTW edits would be just like vi/emacs edits in a working dir: changes you have to commit yourself17:46
mtaylormgedmin: it is not VC, but it does mean that the hooks are already there in the Zope 2PC to commit on object save17:46
mtaylormgedmin: well that would certainly be easier17:46
mtaylorMattCampbell: yes17:46
mgedminhow much power from the filesystem does bzr want?17:46
mtaylorMattCampbell: although it doesn't know how to do more complex things yet17:47
mgedmine.g. does it work on stupid FAT fs'es?17:47
mgedminbzr is cross-platform, so I assume it won't need hardlinks (or symlinks)17:47
mgedminwhat about atomic renames?17:47
mwhudsonmgedmin: bzr runs on stupid FAT fses i think17:57
mwhudsoncase insensitivity can throw some curve balls17:57
jammwhudson: correct18:08
jelmerwhat's the idea for post-1.0 versioning?18:13
jelmerStable and unstable branch or just one development branch?18:13
jelmerif the latter, what are the version numbers going to be, 1.X or 1.0.X ?18:13
mwhudsoni think 1.1, 1.2, 1.3.  not sure though18:14
jamjelmer: in Martin's post he said "1.1 in January"18:22
jamso I think the plan is to just keep doing 1.X releases18:22
jamevery month18:22
jelmerah, ok18:58
Treeformhey, i have a text file i guess i would like to treat as binary his this option been already added to bzr?19:12
PengTreat as binary? Why?19:13
Treeformwell it takes 1.5 GB of my ram to commit now and its only 40mb file19:14
PengOoh.19:14
Treeformits a files of a 3d model19:14
jelmerTreeform: sorry, there's nothing binary-specific yet19:14
Treeformmost models where not this bad19:14
PengWhy would treating it as binary help?19:14
TreeformPeng, well png and jpg commit just fine19:14
jelmerTreeform: there was talk about support for streaming though19:14
Treeformand they are big too19:14
Treeformyes that is what i found by googleing19:14
jelmerTreeform: so it wouldn't be necessary to keep various versions of the full file in memory19:14
Treeformwell i realy dont need to keep it versioned per line19:15
Treeform3d program generates it19:15
Treeformi just need to over write it every time just like it does images19:17
jamTreeform: any chance you could help us figure out why we are taking 1.5GB to commit?19:33
jamlike, is there a way you could make that file public for us?19:34
jamespec if you could have us see the .knit file (in case it is because of history as well as just the file itself)19:34
jam40MB => 1.5GB seems like we have a rather serious bug19:34
Treeformok its more like 1gb19:34
Treeformit ate up my ram and moved into the swap19:35
Treeformwhich made it super slow19:35
Treeformjam ok i will upload the file19:35
Treeformjam, its 79mb and its here if you wan http://affuniverse.com/artdepot/Treeform/fleetbox-full2.egg.zip19:45
Treeformthe file does that on add19:45
Treeformi have no clue what it will do on merge19:45
jamTreeform: and what version of bzr?19:47
jamhmm... it is only 7.9MB :)19:47
jamis this just 1 copy of the file?19:47
jamnot the history of it?19:47
Treeformthere is no history19:48
Treeformi just bzr add and bzr commit19:48
jamyou have 1 copy and it took 1GB to commit it?19:48
Treeformyep19:48
Treeformits zip unzip the file19:48
jamwill do19:48
Treeformit unzips to 78 mb19:49
jamthat seems really strange19:49
Treeformmaybe i am wrong my system almost lucked up during the commit19:49
jamyah, I see 80M here19:49
Treeformi could not tell what exacty it was but i guess its this file19:49
jamI won't say you are wrong, but something really odd is going on if that is happening.19:49
jamAlso, what repository format are you using?19:49
jamand bzr version19:49
Treeformhow would you look that up?19:50
jamit is ~2.6M lines long19:50
jambzr --version19:50
jambzr info19:50
jaminfo gives the format string19:50
jam--version tells me about bzr19:50
Treeformjam, http://dpaste.com/28430/19:51
Treeformi think i use the one in the ubutnu apt-get19:51
jamTreeform: and what Ubuntu version? You can add the Bazaar repositories here:19:53
jamhttp://bazaar-vcs.org/releases/debs/19:53
jamsomething like: deb http://bazaar-vcs.org/releases/debs/gutsy ./19:53
jamIt would just be good to test with bazaar 1.019:53
jamand also possibly test with --pack-0.9219:53
jamto see if that changes things19:53
Treeformbut i dont want to version files this big any ways19:54
Treeformi want for it to just think of it as a binary file19:54
jamwell, we treat binary files in almost the same fashion19:54
jamthere are a couple places that are different19:55
Treeformoh so you version parts of them?19:55
jambut I'm hoping that by 1.0 we fixed some of what you are running into19:55
jamTreeform: all files are "binary" that just happen to have some '\n' in them19:55
jamat least at the lowest layer19:55
Treeformhmm19:56
jam'bzr diff' knows not to display files that have NULL in them19:56
Treeformhmm that sounds as a hack19:56
Treeformdid you try the file did it work for you?19:56
jamand 'merge' knows to just overwrite the file, etc.19:57
jamI just finished downloading, I'll let you know in a second (I'm running some timing tests, and don't want to interfere with it)19:57
Treeformok and i have upgraded19:59
Treeform1.019:59
Treeformjam, so it will treat is as binary if a tack a null at the end?20:00
jamonly in the beginning 1024 bytes, iirc20:00
jamI'm guessing, though that it has more to do with the 2.6M lines20:01
Treeformit used only 350mb on the new one to commit the 80mb file20:02
jamwith bzr.dev and knits, it took 650MB before I killed it because my machine was very unhappy20:02
Treeformjam, yes its a big text file you can take a look at the date if you want20:02
jamI'll try again with packs20:02
jamTreeform: is it okay if I make this file public for testing purposes?20:04
Treeformgrr i would rather you woulnt20:05
jamno problem20:05
jamI'll keep it private per your request20:05
Treeformyou can probably generate a file based on it that would cousel the same problem20:05
jamprobably20:05
jamI just hit 700MB real20:06
jamso it seems to still be a problem20:06
Treeformok20:06
Treeformprobably if bzr had real binary support that would not be a problem20:06
jamnot really, it is just somewhere internal where we are splitting into lines and being innefficient about it20:07
Treeformalso i was thinking to use bzr for sql databases dumps... wouldn't they have similar stricture to this file?20:07
jamI can't say for sure20:07
jamanyway, thanks for letting me see a test example20:07
Treeformjam, no problem i like bzr its good to be of help20:09
jamTreeform: now *my* machine is sluggish as it pulls everything back out from swap20:09
Treeformyep20:09
Treeformmine almost crashed the first time20:09
Treeformi had most the gig in use when bzr hit it with another one20:10
jamTreeform: bug #109114 is where this is discussed if you want to follow it a bit20:14
ubotuLaunchpad bug 109114 in bzr "commit holds whole files in memory" [Medium,Confirmed] https://launchpad.net/bugs/10911420:14
Treeformjam, you probably could replace all the chars and numbers with random chars while keeping the white space and brackets the same then make it public20:22
jamwell, I was going to start with creating just a trivial file with a lot of lines20:23
jamand see if that reproduces it20:23
Treeformi dont think bzr reads the brackets20:23
Treeformbut it might read stuff like >>> === >>>20:24
jamyeah, I *think* it is just because it has 2.6M "\n" in it20:24
jamwell, that and it is 40MB to start with20:24
Treeform80mb20:24
jamoh, right20:24
Treeformi have another 40mb files thats v1 of this file20:24
Treeformbut they have different name20:24
Treeformartists ...20:24
jamwell 'bzr rename' would help :)20:25
lukshm, that's weird. the RAM usage goes high even when only removing such files20:25
luksit's actually higher than when I was adding it20:25
jamluks: committing the removal of the file?20:25
jamthat does seem odd20:25
luksyes20:25
Treeformjam, is there a way to permanently delete a file form bzr including all previous versions?20:25
Treeforman irreversible operation20:26
jamno20:26
jamnot without something like 'rebase'20:26
luksuh oh20:27
jam?20:27
luksI see difflib.py in lsprof-file output when removing the file20:27
Treeformi had to restart this repos because aritsts just commit crap and move it without proper move20:27
luks__chain_b is taking the most time20:27
luksit shoudn't use difflib.py at all, no?20:27
jamArguably it could notice that the new text is empty20:28
jamI would have to track through the code, though20:28
lukshm, _patiencediff_py is calling it20:28
jamit shouldn't need to hit difflib for the add or the remove20:28
jamluks: well, then you at least need to "make" to use _patiencediff_c :)20:28
luks:)20:28
jamThe big thing is that we shouldn't really *need* to use the SequenceMatcher20:29
jamIt doesn't matter which implementation we are getting20:29
jamThat actually might explain memory bloat a little bit20:29
luksyes, but it does right that difflib is the most expensive operation, when it doesn't even use it for sequence matching20:29
jamas the sequence matchers use a dictionary, etc.20:29
lukser, it is not right20:30
luksumm, even weirder is that patiencediff is called from _merge_annotations, which isn't even used in packs20:32
elmo=== removed symlink 'lala'21:41
elmobzr: ERROR: No such file: u'/etc/lala'21:41
elmowith bzr 1.0rcsomething diff - known bug?21:41
elmosrsly, still no gutsy debs on bazaar-vcs.org?21:46
poolieelmo, they'll be there soon22:09
elmopoolie: ok22:09
elmowell I filed a bug in the meantime, hopefully it's not something that's fixed in release.  or maybe hopefully it is.  who knows22:09
ubotuNew bug: #177282 in bzr "[1.0 regression] bzr diff bombs out on removed symlink" [Undecided,New] https://launchpad.net/bugs/17728222:11
poolieelmo, i'm not sure off hand22:13
jamelmo: are you using the final release of 1.0, or 1.0rc1?22:19
jamISTR bzr 1.0rc1 having that bug, but it was fixed by 1.0rc2 or 322:22
jamthe NEWS entry shows the fix in rc1, but I'm guessing it is just put in the wrong place22:22
vilahi all, just passing to ping about http://bundlebuggy.aaronbentley.com/request/%3C1197963539.13798.1.camel@lifeless-64%3E22:28
vilaif nobody objects, I'd like to merge it (see my comment)22:28
jamvila: I wouldn't say that I object :)22:28
vilatypo ? :-)22:29
jamI'm fine with the concept, I haven't thoroughly reviewed the code22:29
pooliei'd kind of like to read it22:30
vilapoolie: ok, I'll go sleeping now, so feel free to comment, my ping was just a way to say: 'I want that since I need it and I'm willing to help merging it soon'22:31
vilaincluding tweaking it if needed22:31
poolieis "randomize" a more standard spelling?22:31
jamrandomize randomise22:32
jamWell, my spellchecker doesn't like the latter22:32
vilagnome-dictionary-applet says the latter is a synonym for the former22:33
vilanight all22:33
=== i386__ is now known as i386
radixrandomize is the american spelling22:34
jampoolie: I believe one is UK and one is US22:34
poolieyeah22:34
jamas with most 'ise' versus 'ize'22:34
poolieand i think software should normally be US22:34
jampoolie: I would tend to agree, but I know robert likes to use UK22:34
datowhat does one use in AU?22:35
jamAnd then you have "bzr viz" which is the shortcut for "bzr visualise"22:35
poolieUK, but most software is done in US22:35
poolieobviously people can read both, but having a mix is annoying22:35
pooliei'd like to merge your on-demand loader john22:36
pooliei think being able to load fewer modules is the deciding factor22:36
lifelessits not that I prefer UK spelling22:42
lifelessI'm a new zealander22:43
lifelessI generally write New Zealand english.22:43
jdahlincongrats for the 1.0 release everybody22:44
pooliethanks johan!22:44
pooliehi lifeless22:44
pooliesorry to bug you with work, but could you please chmod some more things on escudero?22:45
lifelessisn't elmo right here ? ;)22:45
poolienot answering22:45
poolieuh22:45
lifelessah22:45
lifelessok sure msg me the commands to run22:45
pooliethe sensible next step is to ask for sudo access to your account22:46
lifelesson that machine, makes sense to me22:46
poolie0.5 ;-)22:46
lifelessuntil that service account is made :)22:46
pooliefind /srv/bazaar.canonical.com/www -user robertc \! -perm -020 -exec chmod g+w {} \;22:48
lifeless ssh escudero 'find /srv/bazaar.canonical.com/www -user robertc \! -perm -020 -exec chmod g+w {} \;'22:51
lifelessdone22:51
lifelesswell running22:51
lifelessdone22:51
igcmorning22:52
lifelesscan you do whatever changes you want to that tweaked merge and send it in ?22:52
poolievila's going to22:53
pooliethanks btw22:53
poolieor did you want it sooner?22:53
lifelessnah just that someone will :)22:54
MicahElliottHi.  I've been toying with bzr and hg.  I found hg has a -A (addremove) option for 'commit'.  It's very convenient when you have a new file to save the 'add myfile' step, and just say 'hg ci -Am msg'.  Any plans to add such an option?  Any philosophical reasons not to?23:06
poolieMicahElliott, yes, we plan to add that23:23
pooliei agree it'd be nice23:23
MicahElliottpoolie: thanks.  pretty minor, but thought it was worth asking about.23:28
bialixigc:hi23:35
bialixabout http://bazaar-vcs.org/BzrVsHg#head-a1fbb925120017d8d4b05a2da1eba9469ab4816023:36
bialixIMO text about hg and its dependency on external tool could be emphaside more strongly: it's real pain in the ass especially on windows23:37
bialixprobably their ignorance of built-in merge is the main reason that prevent me to try hg more than for 15 minutes.,23:38

Generated by irclog2html.py 2.7 by Marius Gedminas - find it at mg.pov.lt!