dashjelmer: http://yellow5.com/pokey/archive/pokey80_3.gif00:19
lifelessjames_w`: around?00:43
TDJACRBazaar just took up 765 MB of ram00:44
spivTDJACR: you're adding some large files to bzr?00:48
=== james_w` is now known as james_w
james_wlifeless: briefly01:03
lifelessnvm, filed a bug01:04
TDJACRspiv: No, I branched launchpad01:09
spivTDJACR: oh, right.  That's a very large branch, we've been working on improving the memory use in bzr's trunk01:11
spivTDJACR: bzr's trunk plus a couple of patches that will land shortly uses roughly 2/3rds of the memory of 2.0.1 I believe, and that should keep improving as we work towards 2.101:13
spivTDJACR: (there's ~65000 revisions in Launchpad's history last time I checked, and about 7000 files!)01:15
spivTDJACR: so, basically, known problem, but we're working on it01:16
lifelessvila: buildbot trunk has my subunit patch01:20
spivlifeless: so, how far away is a proper fix for the --subunit issue that's preventing PQM from rejecting test failures?02:48
spivlifeless: I'm wondering if we should temporarily remove the --subunit option until we figure out a better fix.02:49
lifelessspiv: I'm hoping to start on the cleanup this avo02:49
lifelessjust want to get one of the dx ppa builds up first02:49
lifelessstill solving teething problems02:50
spivlifeless: cool, "this arvo" is a good enough answer for me.02:50
spivlifeless: mind if I assign the bzr bug to you?02:51
* spiv updates the bug description02:54
lifelessspiv: uhm02:55
lifelessspiv: I don't particularly care, but its a different bug I think02:55
lifelessspiv: and its not my top priority, I'm just trying to squeeze it it02:55
lifelessright now I don't recall how messy the badly mapped things are02:57
lifelessbasically need to un-messy them and get detection out of the TestResult and back to the TestCase02:57
lifelessit might be an hour, it might be a day02:57
spivand then we'll need the subunit in the pqm updated?02:59
lifelesspossibly. I won't try to depend on the latest, but I may have to.03:00
lifelesshave a look at the code ;)03:00
spivOk.  I think I will temporarily disable the --subunit option then.  The niftiness isn't quite worth the discomfort, and it'll be easy to turn back on when it's sorted.03:00
* spiv has a late lunch04:33
lifelessspiv: subunit doesn't need improving04:43
lifelessspiv: I've tried to correct this meme in the bug, but its not seeming to stick, so I'm coming direct :)04:43
spivlifeless: please feel free to edit the description and summary directly :P04:44
spivlifeless: I wrote the most recent comment before seeing yours about it not being subunit that needs improving, though.04:45
lifelessspiv: kk04:45
lifelessspiv: I'm not stressed, I just want to fix the meme :)04:45
_AndrewI'm getting the error "These branches have diverged. Use the missing command to see how."05:07
_AndrewWhat's the "missing" command and if it's missing how do I use it?05:07
spiv"bzr missing"05:08
_Andrewah, I was doing it wrong.. --missing05:08
spivAnd you'll probably want to use "bzr merge" rather than "bzr pull" to combine the different changes made on the two branches.05:08
_Andrewah ok05:09
_AndrewYes that's working05:09
_AndrewSince I'm already here could you tell me what "M*" means? It's that a conflicted merge?05:10
spivSee "bzr help status-flags"05:10
spivM means the contents of the file have changed (been modified), * means the execute bit changed.05:11
_Andrewok thanks for the help! :)05:12
_AndrewActually I have another question, sorry. Say I have branch A with a file and I want to merge changes from branch B, but I don't want branch A to merge changes from a specific file, how do I do that?05:35
spiv_Andrew: You can do "bzr merge path/to/branch-A/some/file"05:52
spiv_Andrew: note that cherrypicking a change like that won't be tracked by bzr though, i.e. bzr won't remember that you've done that merge (unlike most merges), so it might cause conflicts next time you merge from that branch.05:54
_AndrewCan't you just lock the file or something?05:56
_AndrewIt's an image and I don't want the images to change05:56
spiv_Andrew: oh, you want to ignore changes to a specific file06:36
spiv_Andrew: you can do "bzr revert that_file" after the merge06:37
spiv(sorry, I misread your question)06:37
spiv_Andrew: in general there's no way to say "only these parts of this branch should change".  You can split a project into multiple branches, though, which may help.06:38
KhaZ_Question: for shared repositories to work, do you need to have them be subdirectories in the shared parents root?  Or could I have them (on Windows for instance) as far apart as on different drives?06:45
spivKhaZ_: you need the branches to be inside the shared repository directory, but you can have the working tree(s) for those branches anywhere.06:47
KhaZ_Fascinating.  I never thought about separating the branch from the working dir, but I suppose that's always been the case; I just assumed they were one in the same.06:49
spiv[Branches inside a shared repository are tiny; the things that take up space are the history (which is inside the shared repo) and the working copy that you can edit (which does not have to be co-located with the branch)]06:49
spivIf you do "bzr init-repo --no-trees" (or later "bzr reconfigure --with-no-trees"), then branches in that repo by default will have no working tree.  You can then do "bzr checkout /path/to/repo/branch" from any directory you like.06:50
spiv"bzr checkout --lightweight ..."06:51
spivThe --lightweight is important, otherwise it will make a full copy of the history rather than use the branch's repo :)06:51
KhaZ_Interesting.  So say I currently have two repos that (I believe) are 'standalone', but they really are just clones of each other that I do work in.  I can use reconfigure to change it to a shared repository scheme?06:52
spivYes, I believe you can do "bzr reconfigure --use-shared", although I don't know the precise details.06:53
KhaZ_Hrmm, I'll have to read into that.  Do shared repo's have any other benefit besides space saving?06:54
spivJust space-saving, really.06:54
spiv(Although that can in turn lead to speed improvements)06:54
dashwell branching is quicker inside it because you don't have to copy as much06:54
dashright yes06:55
spive.g. the time to do "bzr branch" will be much much faster, as dash says :)06:55
KhaZ_Right.  Hrmm, maybe I'll put it on the backburner then... Don't do much branching luckily. :)  Still, good to know.06:56
spivKhaZ_: If you have two branches inside a parent, and you cd to that parent and do "bzr init-repo ." then you should be able to cd to each branch and do "bzr reconfigure --use-shared".06:56
spivs/inside a parent/inside a parent directory/06:57
KhaZ_But literally the parent - not just any common ancestor, yeah?06:58
KhaZ_I currently have two paths that could be shared, but they're basically about four levels apart from each other (I'm versioning the contents of my work (Perforce) repo, but source code only, is why I ask).06:58
KhaZ_(On a side note, shazbot is sourceforge's git cloning slow!)06:59
spivI'm not sure how fussy bzr reconfigure is.07:00
KhaZ_Interesting.  I might try that then.07:00
spivI suppose you could always make the repo in the immediate parent and then after the reconfigures move the .bzr of the repo up a few levels.07:01
vilahi all07:01
spivHey vila07:02
spivvila: I've disabled --subunit in make check for now until lifeless figures out what needs to be done to make it do what we need07:03
spivvila: so hopefully babune will stay nice and green from now on07:03
vilaspiv: I've read that and lifeless replies and announce that it will work on it on the bzr side, thanks07:04
vilaspiv: well, babune has a bad flu since a couple of weeks with the leaking tests and then the terminal width saga took me a while to figure, so it's good to know *that* failure source is closed :-)07:06
lifelesshi vila07:22
jelmerwhat's this babune thing people are talking about?07:59
igcjelmer: buildbot test server that vila runs07:59
jelmerah, thanks07:59
igchi vila07:59
vilahi Ian !08:00
vilajelmer: BAzaar BUild botNEt08:00
vilajelmer: https://launchpad.net/bzr-buildbot-net and http://babune.ladeuil.net:26862/ for the full monty08:02
* igc dinner - night all08:03
jelmerg'night Ian08:05
cpf_Just a quick question, how do I install the bzr explorer (and run it?)09:09
cpf_I executed the setup.py install, tried "bzr explorer", but the explorer plugin cannot be loaded...09:09
=== weigon__ is now known as weigon
cpf_Ok, reinstalling qbzr fixed the issue ^^09:32
vilacpf_: what OS/versions are you using ?09:33
cpf_vila: debian, python 2.5.4, bzr 2.0.109:37
vilacpf_: ok, so you're installing the plugins system-wide and not in your ~/.bazaar directory ?09:38
vilacpf_: and when you said "but the explorer plugin cannot be loaded" did you get a proper message telling you about an unmet dependency on qbzr or just a "can't load plugin" kind of message ?09:39
cpf_vila: Uh, 10:32 < cpf_> Ok, reinstalling qbzr fixed the issue ^^09:42
cpf_I ended up installing in ~/.bazaar/plugins, but it's all the same now, it works like a charm XD09:43
cpf_vila: Oh, and no message about an unmet dependency. Just: "Unable to load plugin 'explorer' from '/usr/lib/python2.5/site-packages/bzrlib/plugins'" (When it was installed globally)09:45
vilacpf_: ha, that was my fear, hence my question09:45
vilacpf_: can you file a bug against bzr-explorer on lp mentioning your versions so that a better error message can be issued09:46
vilaand by the way, what made you suspect qbzr ?09:46
cpf_http://doc.bazaar-vcs.org/explorer/en/install-source.html << End of page09:46
cpf_I had all the rest...09:46
cpf_Thought I had qbzr already (used to have it at least)09:46
cpf_Must've lost it somewhere xD09:46
vilaeither bzr-explorer setup.py or __init__.py should report it more nicely IMHO :-/09:48
cpf_I agree, but __init__.py looks scary :(09:49
gioeleCan  BZR_PLUGIN_PATH point directly to a directory that contains a single plugin or should it point to a directory that contains other directories with plugins (like ~/.bazaar/plugins)?10:34
hmelandThe latter.10:35
hmelandMaybe you can trick it with some symlinks?10:36
lifelessvila: what do you think of allowing a path to name a plugin10:37
gioeleI think I'll have to. I am developing a plugin. Right now the development is in a subdir of ~/.bazaar/plugins/. But I'd like to move it to another local repo (point 1) and use the pipelines plugin that creates a serires of directories/branch (point 2).10:38
lifelesse.g/ foo:pluginname@directory10:38
vilalifeless: I think it's an inferior solution if you want to test a specific version of a plugin *because* that plugin may depend on other plugins10:39
lifelessvila: well yes, but its a recurring request10:39
vilaso I think it's better to create a dedicated directory for the tests where you put symlinks to whatever plugins you want10:39
vilalifeless: true10:39
vilamay be we should add two command lines options: --plugins and --single-plugin ?10:39
vilaadding the command-line option is more or less missing right now (I use BZR_PLUGIN_PATH=-site all the time and far more typing than --plugins=-site10:40
lifelessvila: I'd rather come up with a good syntax to specify in the path10:40
vilalifeless: like a leading-but-otherwise-forbidden char ?10:41
gioeleMaybe the semantics of BZR_PLUGIN_PATH could be changed to mean: if the directory itself does not contain a module at the top level, then it act like it does not. Otherwise, if the BZR_PLUGIN_PATH contains a plugin in the top level, then load that without recursion10:41
lifelessgioele: can't do that10:41
vilagioele: 8-(10:41
lifelessneed a plugin name10:41
gioelelifeless: why?10:42
gioele(btw I cannot find a complete example on the use of BZR_PLUGIN_PATH in the documentation, just quick references)10:42
lifelessgioele: because plugins get loaded into bzrlib.plugins.NAME10:42
vilagioele: there is, wait10:43
lifelessgioele: which makes them regular python packages/modules rather than 'different' things10:43
gioelelifeless: can't you say "load the python module that lies in exactly that directory"?10:44
lifelessgioele: load it as what10:44
lifelesswhat would its name be?10:44
vilagioele: http://doc.bazaar-vcs.org/bzr.2.1.0b1/en/user-reference/index.html?highlight=bzr_plugin_path#bzr-plugin-path10:44
gioelelifeless: basename `dirname $path`10:45
bialixhi all10:45
vilalifeless: +plugin:<path> ?10:45
lifelessgioele: that would be wrong far too often10:45
lifelessvila: something; too tired to thing through consequences; my sketch was the one with @ before10:46
vilahmm, using ':' is bad here :-/10:46
gioelevila: oh, I was looking into the dev documentation. Thanks for the link10:46
vilaoh, that was a skecth, sorry, didn't realize10:46
vilahmm, so you could override the dir name, right, that should be optional though, but I see the point10:47
vilalifeless: @ is a good idea and since '+' is already mandatory, I think +[name]@directory will do fine, but the main problem I can see is that it's not a real PATH spec and will need special handling10:51
lifelessvila: whats the + for?10:52
vila+/- is used to add or remove from BPP (BZR_PLUGIN_PATH), see url abov10:53
lifelessvila: + isn't needed then10:53
lifelessvila: unless soeone wants to edit the path10:53
vilaby default you start with +user:+core:+site so if you say BPP=-site you ends up with +core10:53
vilabecause +user is the default value for BPP10:54
vilait's needed to identify magic values10:54
lifelessI dispute that10:54
lifelessits just code10:54
vilaoh, you mean when using @10:54
vilalifeless: look at the tests:10:56
vila['myplugin'], ['myplugin', '-user', '-core', '-site']10:56
vila['myplugin', '+core', '+site', '+user']10:57
vilathe former is myplugin only, the later is myplugin first10:57
lifelessvila: I don't understand your point10:57
vilalifeless: what are you disputing (I may misunderstand that :-) ?10:58
lifelessthat + is needed to use @ as I propose it be used10:58
vilayes, my latest remark, + is not needed for @10:58
lifelesswell, your latest remark was telling me tolook at the tests10:59
vilabecause - makes no sense10:59
lifelessso, you can understand my confusion10:59
vilalifeless: sorry, I meant my remark after you said  'I dispute that'10:59
lifelessso, I don't understand your point *after* that remark11:00
lifelesswhy are you telling me to look at the tests11:00
=== rml_ is now known as rml
lifelesswhat do I have wrong11:00
vilalifeless: forget it then, I thought you disagreed with 'you mean when using @'11:00
lifelessvila: I didn't ssay *anything* after that, except to express confusion11:01
vilalifeless: ok, let's reset at: '@ does not need +' ok ?11:02
* spiv expresses confusion with a confusing expression ;)11:02
=== weigon_ is now known as weigon
phcoderhello, all. I develop in a project which uses svn as main repo. I previously worked with it through git-svn and now due to general dev move to bzr I move to it too. I imported my git stuff with bzr-git but now I find myself unable to merge anything coming from bzr-svn with anything coming from bzr-git. Any help?11:49
=== lamont`` is now known as lamont
=== mtrudel_ is now known as cyphermox
Bear10_I'm having a bit of trouble figuring out how bazaar works, can someone help me out? I've created my repository, and comitted the initial files, now I don't know how working on a remote repository works. Sure I can connect fine, but in the xplorer when I connect it says its on revision one and that there are no working branches.13:52
jammorning all14:02
bialixhello jam14:02
bialixBear10_: read tutorial from this section and down http://doc.bazaar-vcs.org/latest/en/mini-tutorial/index.html#publishing-your-branch-with-sftp14:03
=== davidstrauss__ is now known as davidstrauss
Bear10_bialix, okay I understand this concept, but are all branches you create first local? then you upload the whole branch, and it then creates that branch on the server for others to work on it?14:14
jamPeng_: the chk_map patch is on its way to pqm14:15
jamvila: let me know if there is babune fallout14:15
bialixBear10_: you can create branch on server first14:15
phcoderbialix: would you by chance know how to import git-svn to bzr and have same ids on files as bzr-svn'ed branches?14:15
bialixit does not realy matter14:15
* jam needs to go wrestle bzr-rewrite into submission so I can officially announce 2.1.0b1 14:15
vilamorning jam !14:15
Bear10_sorry im new to this heh read everything i could now its a matter of putting it into practice14:15
vilajam: if you ping me as soon as it lands, I'll make a run just for you14:16
jamBear10_: you can do it either way14:16
vilajam: or if I happen to see it lands before you ping me, I'll telll you14:16
bialixphcoder: I can't say for sure. Try asking jelmer, jam, vila and lifeless14:16
jam*I* tend to create branches locally, and then push them when I'm ready for it14:16
bialixhi guys14:16
vilahey abilx14:16
jamphcoder: svn => git => bzr is going to be very difficult to get identical to svn => bzr14:17
Bear10_jam, that seems most logical (to me)14:17
jamI would recommend using "git dpush" back into svn, and then pulling from there14:17
bialixvila: :-#14:17
jamBear10_: of course, I create *lots* of branches, and push fairly regularly14:17
vilawow, how did I typoed that....14:17
phcoderjam: you mean dcommit? It could work. I need to setup local svn for this14:18
Bear10_jam, where is the "main" build / revision of the app stored? in a branch? the root?14:18
jamphcoder: right14:18
jamBear10_: I don't quite understand the question14:18
jamwhat "app" ?14:18
Bear10_jam, the project14:18
vilasorry Alexander, I meant to type bialix, may be I should use the completion more :)14:18
bialixvila: I was under impression it was intended14:18
bialixvila: anyway you made me good lol14:19
vilanot at all, no idea how it occurred :-/14:19
Peng_jam: Great. :)14:19
vilaha good :)14:19
=== EdwinGrubbs is now known as Edwin-afk
bialixvila: everything is fine14:19
jamphcoder: note, though, that I think you need the *same* svn UUID, and some other such bits14:19
phcoderActually git preserves svn ids. Can I perhaps somehow hack bzr-git to use them to create IDs?14:19
=== mrevell is now known as mrevell-lunch
Bear10_okay i think i understand this now14:21
Peng_I think a recent revision of bzr-git has some git-svn stuff.14:21
phcoderthe last line in log entries looks like "  git-svn-id: svn+ssh://svn.savannah.gnu.org/grub/trunk/grub2@2618 d0de0278-0dc1-4c01-8a07-af38b3205e46"14:22
phcoderPeng_: oh. Looks like my sid is outdated. Going to find bzr dev repo14:22
bialixjam: official announce will be good. it becomes bad habit to wrap tarball, build installers and then announce after a month14:22
bialixjam: no pun intended14:22
jambialix: well, since the 2.1.0b1 installer still doesn't work14:23
jamI haven't announced14:23
jamI was hoping jelmer would release an updated bzr-rewrite14:23
jambut he didn't seem to notice my queries14:23
Peng_phcoder: Note that I didn't claim it will work or anything! :P14:23
jamso I'm going to have to do it myself14:23
bialixjam: I know. But they to gold almost 2 weeks ago14:23
bialix*going to gold14:24
phcoderPeng_: I guess I'll have to find out and hack if needed. Can someone provide me an insight on how file UUIDs are generated?14:25
phcoderor a link to dev doc should be ok14:25
jamphcoder: it depends on the source and converter14:29
jamI believe bzr-svn's codebase is where you want to look14:29
jamIIRC it was something like branch@revno+path14:29
Peng_I think the syntax might be a little different, but that's basically it. It includes the repo UUID.14:30
Peng_(I think?)14:30
phcoderHow can I look at File IDs in my repo?14:30
Peng_phcoder: Various commands accept a "--show-ids" argument. "inventory" might.14:30
jamvila: what is the status of: https://code.edge.launchpad.net/~vila/bzr/353370-notty-no-term-width/+merge/1383214:32
jamDid you decide to abandon it?14:32
vilahuh ? Certainly not, but you said you wanted it to be discussed, so I'm waiting :-)14:33
vilaWell, may be I should have summarize some more ideas I had since, but I thought there was already some meat (and code !) to start the discussion14:34
=== mrevell-lunch is now known as mrevell
vilalike, we may want to move some parts of that into bzrlib.ui....14:34
vila...fater our discussion friday, I wasn't sure about the outcomes, having thought a bit more about COLUMNS, it seems that if we see it in os.environ, it means the user set it, so I stand by my design to obey it if present (unless proved wrong, but all my tests on various OSes so far...)14:36
vilas/fater/after/ damn fingers14:36
* vila removes his boxing gloves14:37
phcoderbzr is downloading at 2 KB/s on otherwise decent connection. What may be the cause?14:41
vilajam: what were you referring to in 'Peng_: the chk_map patch is on its way to pqm' ?14:41
jamvila: https://code.edge.launchpad.net/~jameinel/bzr/2.1-static-tuple-chk-map/+merge/1374014:42
jamusing StaticTuple in the CHKMap code.14:42
vilapqm queue is empty...14:43
bialixphcoder: bzr ls --show-ids14:44
phcoderbialix: already found it, thanks. When I'll download bzr at this 2KB/s I'll get hacking on it.14:46
phcoderI'll probably go with lightweight checkout14:46
bialixyou can get tarball then14:47
vilajam: so you didn't submit it to pqm yet ?14:47
jamvila: it is submitted, and going through testing now14:47
jamunless it got rejected...14:47
jamhmm.... I sent it, I'll try again, I guess14:48
vilamay be some delay between you and pqm...14:48
jamNo, I'm just full of it14:49
jamI realized I wanted to update NEWS before submitting14:49
jamand then forgot to push and then submit14:49
vilahappens :-/14:49
phcoderTarball downloading is at 400KB/s. Checkout is at 2KB/s. Why is this? Unfortunately I have the same problem on grub2 bzr too14:51
jamphcoder: what version of bzr?14:52
jamvila, Peng: now it is *really* there14:52
phcoderphcoder@debian:~/repos$ bzr version14:53
phcoderBazaar (bzr) 2.0.114:53
vilajam: ok14:53
vilajam: I haven't read the patch in detail, so just a quick check: it doesn't makes the C extension mandatory right ? (Welll babune *will* tell, but you're faster :-)14:54
jamvila: it isn't supposed to. It *is* supposed to make using one of the StaticTuple implementations mandatory14:55
vilaerrrr, I thought spiv said he desactivated --subunit on qpm but I'm still seeing the progress report...14:55
vilaohhh, I missed more than I thought then, you made python and C impls. for StaticTuple ?14:56
vilaI thought you keep using tuple for python...14:56
phcoderlink here http://bazaar-vcs.org/BzrPlugins to bzr-svn is broken can somone provide me the good one?14:57
jamvila: he did, and it is a different progress indicator14:58
jamhence why it says "0%"14:58
jamvila: _static_tuple_py.py inherits from 'tuple'14:58
jamrather than wrapping it14:58
jamso that you don't get 2x memory *bloat* when not running the extensions14:58
jamphcoder: 'bzr branch lp:bzr-svn' ?14:58
Peng_jam: BTW, when using _static_tuple_py, does intern() intern forever?15:00
vilajam: by the way, one of the expected outcome from reducing memory consumption was also to reduce time spent handling it, did you see some significant performance improvement  there ?15:00
jamPeng_: yes, I can't mutate the refcount of native python objects15:00
phcoderjam: worked. Thanks15:00
jamvila: 'time bzr branch launchpad' went from 10-11m => 8.5m15:01
vilajam: nice !15:01
jamvila: I think it is mostly from removing GC objects15:01
jamwhich I *think* has a quadratic effect15:01
jameverytime you allocate N gc objects, it does a gc sweep15:02
jamand then you have +N objects15:02
Peng_jam: ...That's kind of bad.15:02
vilaoften more than linear yes15:02
jamso after doing 100k objects, you have triggered 100k / 700 sweeps, and each one at 700 objs, 1400objs, ... etc15:02
jamanyway, I expect small to no improvement for "bzr branch bzr" but a modest improvement for 'bzr branch lp'15:04
jamand probably an even bigger on for "bzr branch mysql"... probably quite significant for "bzr branch OOo"15:04
visik7is there a way to tell the webdav plugin to remember user and pass ?15:06
vilavisik7: yes, use authentication.conf15:09
visik7vila but I need to specify the user/pass in that file ?15:10
visik7what's the difference of specifying if in branch.conf as http+webdav://username:password@domain/path ?15:11
vilavisik7: well, either that or you type them15:11
visik7I would a way to autosave from the command line when I first branch/checkout15:11
vilaautosave is a can of worms nobody want to open now15:12
vilavisik7: but patches welcome !15:12
vilaspecifying them in branch.conf is more risky and branch specific whereas authentication.conf will allow you to specify them *once* for each host15:13
vilaor even a whole domain depending on your usage, see the doc15:13
vilavisik7: http://doc.bazaar-vcs.org/development/en/user-reference/index.html#authentication-definitions15:14
nyu$ bzr upgrade --format=rich-root-pack15:28
nyubzr: ERROR: Cannot convert from format Branch format 7 to format <class 'bzrlib.branch.BzrBranchFormat6'>.    No converter15:28
nyuam I out of luck?15:28
nyuwith bzr 2.0.115:28
jamnyu: that is a downgrade, is there a reason you want to do so?15:30
nyujam: I want to remain compatible with bzr 1.515:30
jamnyu: I guess that isn't something we specifically worked on. let me check the code a bit15:32
jamyeah, i think Branch7 was introduced in bzr 1.6...15:34
* nyu screams vendor lock-in ;-)15:34
jamis there a reason 1.5?15:34
nyuI use 1.5 myself, as it comes in debian lenny15:34
nyuand I wouldn't want to make it harder for all lenny users to access the repo15:35
d1bnyu: just make it available via svn / git  as well..?15:35
nyuactually it comes from svn, but we only have trunk there15:36
nyuuhm.  I guess most users can live with just trunk15:36
d1bnyu: do users use svn / bzr?15:37
nyuwell, I was thinking more s/users/casual contributors/15:38
nyuthe kind of people who send a patch once and are never seen again15:39
jamnyu: well, it is trivial to do the downgrade15:39
jamwe just didn't implement it15:39
jamI think it will be about a 10-line plugin15:39
jamgive me a sec15:39
nyuphcoder: sounds like an easier approach15:39
phcodernyu: what an effect when a GNU maintainer asks ;)15:40
nyuhey, I wasn't asking15:40
nyujust suggesting :-)15:40
nyuwant me to give up with 1.5 completely?15:41
d1bnyu: what project is this btw ?15:42
nyud1b: GRUB15:42
d1bgrub uses bzr?15:42
nyuto some extent yes :-)15:42
d1bi only see svn on the site tho.15:42
nyumaybe we end up switching completely15:43
nyuoh, haven't had time to update it15:43
nyubesides, the website is still in *CVS*15:43
d1bnyu: plz do provide another version control system to download stuff via tho :) -> im also on lenny and don't want to update foo just to get the dev current stuff15:43
jamnyu: well, I looked at implementing a converter, but it looks like the upgrade code doesn't want to do it cleanly. So I'll give you the real secret way15:44
jamecho "Bazaar Branch Format 6 (bzr 0.15)" > .bzr/branch/format15:44
jamnyu: as long as you aren't using stacking, format 6 is identical to format 715:44
nyujam: lol15:44
nyuok :-)15:45
jamthe format bump was mostly a 'compatibility' flag.15:45
jamWe didn't want older bzr's to think they could write to a stacked branch15:45
jamand then bork the content15:45
nyuif I don't know what stacking is, does that mean I'm not using it?15:45
jam'bzr branch --stacked'15:45
jamI doubt you are using it15:46
jampossibly on Launchpad, but that doesn't sound like where you are doing this stuff15:46
nyu$ bzr branch sid/mips15:46
nyubzr: ERROR: Unknown working tree format: 'Bazaar Working Tree Format 6 (bzr 1.14)\n'15:46
jamnyu: 'bzr2.0 remove-tree' 'bzr1.5 co .'15:47
jamactually, I think "bzr remove-tree; bzr co" would do just fine with 2.015:48
nyustill same error15:49
nyunote this branch is an import from git15:49
jamnyu: well, if you just do "bzr remove-tree" then it shouldn't be possible. Though I'm wondering if there is another WT somewhere that is confusing it.15:51
nyuwell, this branch is inside a rich-pack15:52
nyuand I'm branching to outside of it15:52
nyusame problem when branching to inside the rich-pack15:53
bialixWT == working tree15:57
vilajam: babune run started16:04
jamvila: thx16:18
=== sdboyer is now known as agentrickards_lu
=== agentrickards_lu is now known as sdboyer
=== deryck is now known as deryck[lunch]
phcoderwhich API function is used to add a file to a repo?16:49
=== beuno is now known as beuno-lunch
TakI'm using WorkingTree.smart_add16:57
Milo-hello, is there a documentation somewhere how to handle binary conflicts?17:10
Milo-mv file.ext.OTHER file.ext causes 'unknown file.ext' message to status, so that sounds like a bad idea.17:11
GaryvdMMilo-: That's odd - Are you sure you did not have a typo.17:19
Milo-it gives two messages to status17:19
Milo-"removed file.ext" and "unknown file.ext"17:19
Milo-and when you finally hit bzr resolve, it says all is fine, but when you commit is says "missing file.ext.OTHER"17:20
GaryvdMMilo-: If not confidential, please pastebin the actual output17:20
Milo-I'm thinking I should move file over another like that.17:20
Milo-I shouldn't*17:20
Milo-can't, team mate handled that conflict17:21
Milo-with my instructions.17:21
Milo-and he used windows's bazaar integration..17:21
=== deryck[lunch] is now known as deryck
GaryvdMMilo-: "missing file.ext.OTHER" - that sounds like "file.ext.OTHER" was committed.17:21
Milo-GaryvdM indeed :/17:22
mzzthat sounds like something/someone did a "bzr add file.ext.OTHER", and then "bzr resolve" removed that .OTHER file17:23
mzzhmm, I can't reproduce anything but a cosmetic problem if I do that though.17:26
mzzspecifically I get a "missing a.OTHER" when I commit, but the commit succeeds and a.OTHER doesn't seem to get committed anywhere.17:26
mzzthat doesn't seem to be a merge/resolve-specific thing, actually.17:27
mzzif I touch, bzr add, and rm a new file I get that same "missing b" on commit (and it's not mentioned at all in status)17:28
jfroy|workDoes bazaar support relative dates for logging?17:28
jfroy|workFor example, "17:28
jfroy|work*For example, "give me the logs for the past week"17:28
Milo-I did the binary conflict now with openoffice17:28
jfroy|work(for some definition of week)17:28
Milo-made file.odt, changed it in two locations17:29
Milo-commited the other one17:29
Milo-updated on the other checkout and got conflict, now I only have "file.odt.OTHER, file.odt.THIS, file.odt.BASE"17:29
mzzjfroy|work: skimming "bzr help revisionspec" says it can do yesterday, today, and tomorrow, but I see no other relative things there17:30
Milo-file.odt has been renamed to file.odt.OTHER17:30
Milo-thought THIS had my changes and OTHER the other person's changes.17:30
mzzMilo-: checkouts are special like that, iirc17:30
jfroy|workI guess you could use -r date:{last's week date}..17:31
Milo-so how do you resolve the conflict?17:31
Milo-should I manually merge the stuff to the .OTHER and then just hit resolve?17:31
Milo-or what?17:31
mzzMilo-: I'm pretty sure you should just put the right content in file.odt and then "bzr resolve"17:32
IslandUsurperMilo-, if file.ext is the way you want it, you can probably bzr rm file.ext.OTHER17:32
mzzMilo-: normally bzr gives you a bunch of files to make that easier: your version, the other version, the closest ancestor version, and a merge17:32
mzzMilo-: it can't give you a merge for a binary format, which is probably why file.odt is now missing17:33
Milo-did `bzr resolve file.odt`17:33
Milo-that removed the .OTHER .THIS and .BASE17:33
Milo-and now I don't even have the file.odt :D17:33
mzzthat's odd17:33
Milo-renamed: file.odt => file.odt.OTHER17:33
mzznormally you just do "bzr resolve" and it detects which conflicts you actually resolved17:34
Milo-that was one of the lines that I got when I did bzr update17:34
mzzbah, the term I did this in has no scrollback17:34
Milo-what if I just want to ignore the changes my team mate did?17:34
mzzyou'd cp or mv the right file to file.odt and bzr resolve17:34
Milo-that's what I told my team mate to do17:35
Milo-and we had the missing 'error'17:35
Milo-since it committed all nicely it doesn't 'really' matter17:35
mzzI tend to avoid checkouts in cases where you actually end up merging, because they're a little confusing.17:35
mzzI don't understand why you'd get that error unless something went and bzr added that file17:36
mzz(it's entirely possible some integration thing did that, I don't use those)17:36
Milo-I use branches with my laptop and checkout with my desktop17:36
Milo-since laptop is mostly offline (or can't reach port 4155), and desktop isn't17:36
Milo-well, I used bash, and that renamed the .odt file completely17:36
mzzI think the message you're getting is just cosmetic (it noticing the file vanished from the working tree since the last time it looked)17:37
jamMilo-: "bzr resolve file.odt" forcibly resolves the conflict. (giving an explicit name tells us that you want this file to be unmarked.)17:38
Milo-jam yes17:38
jamas for "mv file.odt => file.odt.OTHER"17:38
jamthat would hint that you had deleted the file locally17:38
jamand someone else made changes that you merged17:38
Milo-yes I know17:38
Milo-thought it would bring the local copy back17:38
jamif you still want the file gone "bzr revert file.odt" should do the right thin17:38
Milo-by re-renaming the OTHER17:38
jamMilo-: it *did*, but as "file.odt.OTHER" to indicate it was deleted locally17:39
mzzit's trying to prevent you from accidentally resurrecting the file, afaict.17:39
Milo-but now if I move some other file as 'file.odt', the change history points to some other file, that gets destroyed along with file.odt.OTHER ?17:40
mzzI'm not sure if this is exactly *always* the case, but if you do get a conflict it's pretty unusual to be able to commit the conflicting file as-is.17:40
mzzI don't follow.17:40
mzzif you put some completely unrelated file in as file.odt and say "bzr resolve" or "bzr resolve file.odt" I'd expect it to remove file.odt.{THIS,BASE,OTHER}17:41
mzzI don't understand what "the change history points to some other file" means17:41
Milo-it removes them, but the repo still has history of that file.odt that had the conflict in the first place..17:41
mzz(how could it not have that history?)17:42
Milo-and now that the file.odt is no longer that file, the history isn't exactly 'his' now is it?17:42
Milo-file.odt is replaced with some other file17:43
mzzwell, he did "bzr merge somebranch", and committed.17:43
mzzso the history from branch "somebranch" is now part of the history of that branch too17:43
Milo-the history points to the old file.odt, right?17:43
mzzthat's what a merge *does*, very roughly.17:43
Milo-but this wasn't from merge..17:43
mzzif you run "bzr log file.odt" you'd see those old revs, yes.17:43
mzzif this is a checkout that got out of date and got updated that *is* a merge17:44
mzzI am confused about what you're confused about!17:44
nyuhow do I extract a diff of the whole branch? (other than searching the branch point + bzr diff -r<branchpoint>..<head>)17:49
dashnyu: bzr diff -rancestor:../parentbranch17:50
dashwhere "../parentbranch" is the path to the branch you want to diff against17:50
=== beuno-lunch is now known as beuno
beunoPeng_, hi18:14
beunowould you like to take a peak at my YUI3 mp?18:14
Peng_beuno: Sure, but I can't really review it.18:15
Peng_I'd be happy to poke at it a bit, though.18:15
beunoPeng_, poking at it and seeing if there's anything broken is good progress  :)18:15
Peng_beuno: What do you mean by the search results being "off"?18:17
beunoPeng_, if you search, the autocomplete doesn't appear beneath the search box, it ends up middle aligned or something like that18:17
Peng_Oh, fun.18:19
beunoyeah, I will fix that18:19
Peng_Well, I just put it up on http://bzr.mattnordhoff.com/loggerhead/.18:21
beunoit seems to work for me18:22
Peng_beuno: The YUI module pluginhost is getting loaded too18:22
Peng_I mean, and it isn't declared in the page, so it always gets loaded from Yahoo! instead of using the local copy.18:22
beunoPeng_, that's interesting18:23
Peng_beuno: Mind if I assign bug #439155 to you?18:24
ubottuLaunchpad bug 439155 in loggerhead "Upgrade to YUI 3.0.0" [Low,Triaged] https://launchpad.net/bugs/43915518:24
beunoPeng_, not at all, I could use the karma!18:24
Peng_beuno: Ah, sorry, pluginhost doesn't get loaded after I refresh everything.18:27
beunoPeng_, good. Those things are a PITA to debug18:28
Peng_beuno: Poking around a bit, everything does seem to work. :)18:29
beunoPeng_, super. Could you comment on the MP so we encourage mwhudson to approve?  :)18:30
=== raimue is now known as Raim
=== asac_ is now known as asac
* beuno waves at mwhudson 19:16
mwhudsonbeuno: hello!19:16
beunomwhudson, how are you?19:17
mwhudsonbeuno: i am ok19:17
mwhudsonslightly disheartened by how much email even a single day off has resulted in19:17
mwhudsonbeuno: how are you?19:17
beunomwhudson, pretty good, doing the release week dance, but good19:18
mwhudsonah yes19:18
beunomwhudson, did you have time to look at me yui3 branch?19:21
mwhudsonbeuno: no19:22
mwhudsonbeuno: did you do the merge proposal thing?19:22
beunomwhudson, https://code.edge.launchpad.net/~beuno/loggerhead/yui3-0-0/+merge/1374419:22
mwhudsonstrange, i don't have that mail19:23
beunomwhudson, it ooped  :)19:23
mwhudsonoh yeah :)19:23
mwhudsonhm, it doesn'19:25
mwhudsont have a diff either19:25
vilajam: breathe again !19:31
vilajam: babune just finished (and except for random leaking tests related faliures on OSX all is well)19:31
vilajam: well, and one random on gentoo, but that doesn't count either :-/19:32
fullermdOh, does that means it's safe to go back in the bzr.dev?19:34
vilafullermd: hehe, it has always been safe :-)19:36
=== abentley is now known as abentley-lunch
fullermdFamous last words...19:40
mwhudsonbeuno: replacing region.left with search_box.get('offsetWidth') doesn't seem like it's going to work19:44
beunomwhudson, it doesn't  :)19:45
mwhudsoni see19:45
beunoI need to fix that before landing19:45
mwhudsonbeuno: why does region no longer work?19:45
beunomwhudson, it's a great question. I haven't been able to find out. I went around in circles for a good hour, and gave up  (that includes asking in #yui3)19:46
mwhudsoni love the way noone actually knows what they're doing in js :(19:47
mwhudsoni mean, i know _i_ don't19:47
mwhudsonbeuno: basically i agree with Peng20:05
mwhudsonbeuno: it looks fine, but fix the bug before landing, eh?20:05
beunomwhudson, sure, I will and land, thanks20:06
mwhudsonbeuno: i might try to poke at fixing the bug today if i get a moment20:06
beunothat would be nice20:07
hufhi, we used to have a working bzr smart server (with bzr+http, fcgi, apache)20:10
hufthe bzr on that system was upgraded to 1.16.1, and now a bzr push (from a client with bzr 2.0.1) returns this:20:10
hufbzr: ERROR: Server sent an unexpected error: ('error', "An attempt to access a url outside the server jail was made: 'chroot-139343724:///'.")20:10
hufwhat could this be, where should i look for answers?20:11
mwhudsonit's a bzr bug i think20:11
GaryvdMhuf: What was the bzr version of the client?20:11
Peng_huf: Bug #348308.20:12
ubottuLaunchpad bug 348308 in bzr "Smart server jail breaks bzr+http with shared repos" [High,Fix released] https://launchpad.net/bugs/34830820:12
Peng_The one bug number in the world I have memorized.20:12
Peng_huf: The fix is in bzr.dev; upgrade your server to it. Or, you can use the monkeypatch listed in that bug.20:13
=== abentley-lunch is now known as abentley
hufthanks, that patch seems to have fixed it20:19
hufhow long should a branch of a ~200M repo take?20:33
hufokay ;) i managed to segfault apache's mod_fcgid process handler with a bzr branch command20:51
Peng_That's awesome.20:55
hufoookay, now i get a timeout in the fastcgi process handler21:05
hufFastCGI: comm with (dynamic) server "/var/www/bzr.nws.hu/bzr-smart.py" aborted: (first read) idle timeout (30 sec)21:06
jammwhudson: hmm.. I've been getting a lot of "Internal Server Errors" in loggerhead today. Does that get recorded as an OOPs ?21:08
mwhudsonjam: no :(21:08
jammwhudson: http://bazaar.launchpad.net/~bzr-pqm/bzr/bzr.dev/annotate/head%3A/bzrlib/_simple_set.pyx21:08
jamnow, that turns out to be a bad URL21:09
jamsince it is "_simple_set_pyx.pyx"21:09
mwhudsonjam: hooray loggerhead error reporting21:09
jambut I wouldn't have thought a bad path would cause an ISE21:09
mwhudsonit shouldn't, indeed21:09
Peng_There's an open bug on better handling of bad input.21:16
hufwhat's the "best practice" method of making password-protected r/w repos and serving them on the net?21:23
jamhuf: anonymous readonly ? or no access?21:26
jamhttp? or ssh?21:26
jamThe most common is to just provide bzr+ssh:// and require full ssh authentication21:26
AfCMy lord. 120 MB of download to propagate a few patches to Eclipse. Someday, oh someday we'll have a binary delta distribution system that is as efficient as the source delta distribution system aka bzr.21:59
awilkinsCan you just push branches into Ubuntu One?22:33
gioeleabentley: hi23:15
abentleygioele: hi.23:15
gioeleabentley: is bzr-pipeline supposed to work only with bzr 2.1 and not with 2.0?23:16
abentleygioele: The 2.0.0 branch is supposed to work with 2.0, and the trunk branch is supposed to work only with 2.123:17
gioeleabentley: I didn't see a 2.0 branch. Is it on launchpad?23:18
abentleygioele: Yes: https://code.edge.launchpad.net/~abentley/bzr-pipeline/2.0.0/23:19
gioeleabentley: ah, OK. The Launchpad page for bzr-pipeline didn't show a 2.0 branch. Could you add that to the list of branches?23:20
abentleygioele: There isn't a 2.0 branch, it's called
gioeleabentley: well, the problem is that launchpad says that it is merged, so it is no longer active, no it will not be shown by default in the list of bzr-pipeline's branches23:22
abentleygioele: Right.  I have just fixed that.23:23
gioeleabentley: thank you23:23
larsemilwhat do i do when a branch has diverged=23:26
dashwell, it means there are changes in your version and the other version23:27
dashyou can merge them if you like23:27
AfCHm. I wonder what would happen if used bzr to transfer songs to my MP3 player, rather than using rsync/unison. Be interesting to see what would happen with such a large amount of opaque data [interesting and no doubt ugly].23:28
dashAfC: do you often use diff on yor mp3s? :)23:29
lifelessAfC: it would work23:29
AfCdash: :)23:29
larsemili did. and then i get a main.cpp a main.cpp.THIS and .BASE23:29
lifelessjust use a little more memory23:29
AfClifeless: the width (ie GBs) wouldn't be a problem?23:29
lifelessAfC: the size of an individual song matters23:29
lifelessin aggregate, it matters for the packing - db file balancing23:30
lifelesspersonally, I wouldn't use bzr to put files on an mp3 player, because I have many more songs than disc space on such devices23:30
AfCSo, the situation is that I'm using Rockbox now on my iPod. It's pretty good! Some rough edges, but quite innovative in other areas. Rather than using (say) gtkpod to get files there, one just copies files to its [vfat :(] filesystem.23:30
AfCOver time, I delete songs I've decided I don't like. This happens on both sides. So I've started using Unison (rather than rsync --delete).23:31
AfCand that's fine, except that it takes Unison almost an hour (!) to find out what the change map is.23:31
AfC[one strangeness is that the mtimes of the files on the device seem to be perennially off by one hour]23:32
AfCso that's why I'm speculating that bzr might do a better job.23:32
AfCon the other hand, there is the question of where to keep the Repository, the fact that the repo would be huge like the Working Tree that I play from normally is, etc23:33
AfCand, of course, I realize full well that this is not what bzr was meant for.23:33
larsemili dont get it - if a branch has diverged do i have to put up the two documents and manually change and edit to the version i would want?23:34
dashlarsemil: do 'bzr merge <otherbranch>'23:35
abentleyAfC: I suggest putting the repo on your computer, and keeping a lightweight checkout on the rockbox.23:35
AfClarsemil: are you talking about source code [or a text based document] or a binary [ie, compressed zip, proprietary binary data, etc, word processor] document?23:35
abentleyYou'll only commit when you want to sync.23:35
AfCabentley: yeah23:36
abentleyYou could have a standalone tree on the computer, and a lightweight checkout of that on the rockbox.23:36
AfCabentley: [I'm mentioning this largely to elicit either a "it'll be interesting to see how you go" or a "you're on drugs, Cowie."]23:37
AfCabentley: that would make sense23:37
spivAfC: I don't think those two options are mutually exclusive ;)23:37
lifelessAfC: the time offset thing is probably vfat mount options23:40
AfClifeless: that was my guess23:40
lifelessAfC: vfat time storage is local, and you've had daylight savings transition recently23:40
lifelessext stores timestamps in utc, so doesn't do that23:40
lifelessAfC: I know one guy managing a 100+GB photo collection with bzr23:41
AfClifeless: I must admit that much as the automounter magic is convenient, I haven't the faintest idea how to go about configuring options for specific devices23:41
lifelessit does it tolerably23:41
AfC[yeah, the DST thing was my guess, though it wasn't a once-off across the transition date, it seems to keep coming up]23:42
spivmwhudson: I'm working on that path escaping patch now23:44
mwhudsonspiv: awesome23:44
spivmwhudson: I can tell that the existing test wasn't written by me because I always use \N{INTERROBANG} when I need a unicode character ;)23:45
Peng_spiv: No snowman?23:45
spivPeng_: you mean, no snowman‽23:47
spivSomeone should make a deck of playing cards with some wacky unicode glyphs rather than the traditional suits.  "My 9 of Interrobangs trumps your 8 of Snowman!"23:49
Peng_That's a really good idea.23:50
Peng_I'm still mostly not a fan of novelty playing cards, though.23:51
dashspiv: also use cuneiform numbers23:51
lifelessPeng_: if your branches are not on launchpad, consider using lp apis to tell lp that you have updated your branch23:56
lifelessin a post push hook23:56
Peng_lifeless: Ehh, that's a little complicated. But yeah, I know I need to set something up.23:58
lifelessPeng_: should be pretty easy23:58

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