/srv/irclogs.ubuntu.com/2008/12/11/#bzr.txt

ymlIf I feel like trying again00:08
dD0THy guys. Did anyone of you try the current windows build 1.9? I'm unable to get the svn plugin working.00:11
dD0TIt says Unable to load plugin 'svn' from 'C:\\Python25\\lib\\site-packages\\bzrlib\\plugins' . But if I understoof the website correctly svn should be included00:12
eferraiuolowondering how to get bzr to recognize my authentication.conf file.00:30
eferraiuoloI'm using the bzr-svn plugin over https and it asks me for my pw multiple times00:30
poolie1dD0T: can you please file a bug in https://bugs.launchpad.net/bzr-svn, including the contents of ~/.bzr.log01:07
poolie1(see bzr --version for the location)01:07
jmlbzr: ERROR: These branches have diverged. Use the merge command to reconcile them.01:20
jmlis there a way I can tell _how_ they've diverged01:20
jmlbzr missing --mine-only, perhaps?01:20
lifelessjml: yes01:20
=== StoneToad_ is now known as stoneToad
jmlhmm. either that interacts poorly with looms01:20
jmlor my loom is shagged.01:21
jml(both are possible, I hit Ctrl-C during a combine-thread and since then it's been a bit wonky)01:21
lifelessjml: combine-thread is basically atomic01:22
jmllifeless: I ended up with a checkout/limbo dir and something else.01:23
* jml resorts to export-loom again01:24
lifelessjml: st;diff;revert should all fix it01:24
jmlyeah, so it looks like my bottom thread has all sorts of stuff that doesn't belong there :(01:26
pygijml, poke :)01:37
jmlpygi: hi01:38
jml:( :( :(01:47
jml_every_ time I work with looms I end up being sad.01:47
pygijml, :/01:51
lifelessjml: is your bottom thread upstream?02:30
=== Mario__ is now known as pygi
newz2000Hi, I made some changes to a project some time ago and now I need to temporarily undo them and apply a change to an older version of a branch and publish it somewhere.03:00
newz2000I did bzr branch project project-2 -r 4 and now have a copy tat is the way I want it03:00
newz2000presumably I can make my change to this copy and get what i want, but how do i avoid bad stuff happening in the future?03:00
newz2000what's the "right" thing to do I guess?03:01
mwhudsonnewz2000: what 'bad stuff' are you afraid of?03:02
newz2000losing a revision or making it hard to put stuff back together down the road03:02
newz2000let me give more details03:03
newz2000I have a branch I share with sysadmins. They codereview and publish it to a website.03:03
newz2000Temporarily we'll be making a change for the holidays03:03
newz2000I want to share my branch with them so that they can push the changes out but later on (after the new year) they'll use my changes that are in progress in the other branch03:04
newz2000I don't want to make their life hard03:04
=== Mario__ is now known as pygi
mwhudsoni think you should be fine03:06
mwhudsonjust tell the admins to use push/pull --overwrite to move your changes onto the sever03:07
newz2000ok, so just commit my change and push to the place I normally push to?03:07
mwhudsonserver03:07
newz2000ok03:07
mwhudsonyou might want to push to somewhere else03:07
newz2000ok, that makes sense03:07
newz2000thanks for the help mwhudson03:08
mwhudsonnp03:08
igchi all03:21
lifelesshi igc03:59
igchey lifeless!04:00
pulsarI am trying bzr update command to get updates from bzr repository on launchpad. it says tree is upto date at revision 183 but when i see it via web interface it shows revision 18406:07
pulsardo I need to do anything before issuing bzr update for it to check the server for new revision06:08
spivpulsar: if you have a branch, you need "bzr pull" to get the new revisions06:08
spiv"bzr update" updates a checkout to be current with the branch that it is a checkout of, "bzr pull" updates a branch from another branch.06:09
pulsarspiv: ok trying that. my version control basics are really weak.06:09
pulsarspiv: it to be at revision 185 now at both places. :)06:10
pulsarthank you06:12
vilahi all07:07
igcnight all08:12
ieeidoes anyone know why I cant add a subdirectory in my bzr branch which includes a .svn subdirectory?? I'm using bzr1.9 and have bzr-svn installed10:24
spivieei: bzr-svn allows you to use bzr to operate on SVN checkouts10:39
spivieei: so if you have a .svn directory in a bzr checkout, then bzr-svn will notice that and so bzr will open the checkout as a SVN checkout and not as a bzr one.10:40
spivieei: you could temporarily disable bzr-svn by passing --no-plugins to bzr10:41
spivieei: but by far the simplest thing to do is to not have the same directory on disk versioned by both svn and bzr10:41
spivieei: e.g. things can get very confusing if the .bzr directory says the checkout is at one revision of the SVN repo and the .svn directory says it's at another10:42
LeoNerdI've tried to keep dual bzr/cvs checkouts before... It's doable, but it takes a lot of careful management10:45
LeoNerdEasy to mess it up, and end up with conflicting histories in each side10:45
spivLeoNerd: dual bzr/cvs checkouts is easier because there's no bzr-cvs10:45
LeoNerdHow does that help?10:46
spivLeoNerd: so you don't have the problem that doing "bzr ci" will try to operate on the cvs data rather than the bzr data.10:46
ieeispiv: thanks, I know that it is a bit stupid and confusing, but what I'm doing here is really stupid in the first place. I want to version the svn metadata in my bzr branch.. so anyway, thanks, i'll just temp. disable the bzr-svn10:46
fullermdFor extra points, version the bzr metadata in svn at the same time!10:55
ieeihehe :P10:58
awilkinsWhere are the Windows installers ;-)  ?11:26
jelmerlifeless, ping13:56
LarstiQpwong14:03
jammorning all14:27
LarstiQhei jam14:27
gioelehi15:14
gioelebzr revert does not revert the last commit. How come?15:14
fullermdBecause revert doesn't revert commits.15:15
luksbzr revert reverts the working tree15:15
gioelebzr uncommit then15:15
gioeleI see15:15
gioelethank you15:16
lifelessjelmer: yo15:28
NfNitLoop*headdesk*   Someone at work has decided that half of the tree I am working on needs to be in another, separate SVN repository.15:38
lifelessNfNitLoop: _nice_15:44
NfNitLooplifeless: isn't it?  This place so fails at sane source control.16:58
jamlifeless: ping18:27
=== Mario__ is now known as pygi
lifelessjam: yo18:45
jamhow's MV?18:46
lifelessintense :)18:46
lifelesssome very good discussion18:46
lifelesschatted with jerry from samba today18:46
jamhow was that?18:47
lifelessgood18:48
jamI was wondering if you had any thoughts on my "chunked" patch.18:48
lifelesssaw it go by last night, haven't had a chance to review; I was feeling quite ill last night18:49
lifelessI'll poke at it asap18:49
jamit isn't critically urgent, but I was hoping for "design" thoughts18:49
jammore than code-level18:49
lifelesswell18:49
lifelesswe've discussed previously yes? seems fine to me18:49
lifelessoutputting thefragments a compressor has as they arrive is ok18:49
lifelessit does seem a little special cased18:49
jamSo the big thing I wanted to get away from was needing to ''.join() and split_lines()18:50
jamwhen some implementation thinks in fulltexts18:50
jamand others think in line18:50
jamlines18:50
jama fulltext => chunks is just (fulltext,)18:50
jamwhich has a nice effect that ''.join([text]) is text18:51
jam(if the list is a single string, it just returns the string)18:51
=== BasicPRO is now known as BasicOSX
jammm-mysql: hey. Any updates on a Lunch schedule?18:55
jamlifeless: btw, the 'chunked' work shows a decrease of about 300MB for the conversion. So we still use 700MB, but that is down from 1GB18:56
jamAnd it seems to start at 400MB and then grow to 700. I'm not entirely sure why18:56
Peng_jam: I have a possibly-stupid question: what's the point of running chunks_to_lines() over the result of file.readlines()? Won't it be identical?19:16
jamPeng_: the previous code did "split_lines(''.join(readlines())"19:17
jamso there was obviously some doubt19:17
Peng_jam: Ah, good point.19:17
jamI believe abentley was concerned about platform differences for file.readlines()19:17
lifelessfile.readlines() can be an arbitrary object19:17
jamLike on Mac 9 it would split on '\r'19:18
jamthough we don't support OS 919:18
lifelessworth a comment I think19:18
jamlifeless: it *can* but that code just did "open(filename)" so we know it is a real File object19:18
jamPeng_: Also if you don't open the file in "binary" mode on Windows19:18
lifelessjam: ah, heh. Certainly things like commit() don't know that19:18
jambut we should always be doing that anyway19:18
lifelessbecause they ask the tree and the tree is virtual19:19
jamlifeless: yeah, that is TreeTransform code19:19
jamwhere we do now19:19
=== bac_uds is now known as bac
=== Mario__ is now known as pygi
marcoilI changed svn-revision-scheme and now I get check_file_version_parents errors when checking and when trying to commit :( I've tried to remove the svn properties in the repo, but no luck19:35
lifelessjelmer: ping19:40
mwhudsonvila: ping19:46
vilamwhudson: pong20:10
mwhudsonvila: so we're vaguely thinking of not using apache to serve bazaar branches from bazaar.launchpad.net20:11
mwhudson(and using something more dynamic instead)20:11
mwhudsonand were wondering what sort of features bazaar needs from an http server for efficient operation20:12
Peng_Something more dynamic?20:12
mwhudsonrange: header support is an obvious one20:12
vilamwhudson: have a look at bzrlib/tests/http_server.py ? :-)20:12
mwhudsonPeng: branches are accessed via ~user/project/name but stored by database id20:13
mwhudsonPeng: this ends up being a pain20:13
mwhudsonvila: good idea!20:13
vilamwhudson: from the top of my head, missing parts will be authentication, but even there I think there are some basis20:14
mwhudsonvila: we really don't care about authentication; yet, anyway :)20:14
vilaand of course you may want https too which I'm still working on20:15
jammwhudson: so if you aren't thinking to enable 'smart' support20:16
jamthen the #1 thing is Range: operation20:16
vilamwhudson: there are also a couple of bugs pending regarding xmlrpc from behind proxies (which is used by the launchpad plugin)20:16
jamvila: that shouldn't effect the server end, though20:16
jammwhudson: we can have some fairly large Range: requests20:16
jamboth number of bytes20:16
jamand complexity of request20:16
mwhudsonjam: yes, i've noticed :)20:17
mwhudson(they break the squid my isp lumbers me with)20:17
jamI don't know how that would effect a potential Squid proxy20:17
jammwhudson: well that specifically is just because we start at 020:17
jamand then make a request >1MB away20:17
jamwe could break that into 220:17
jambut it adds a round-trip20:17
jamand, unfortunately, we don't know we are going to have the problem20:17
jamuntil after we have waiting for a *very* long time20:18
jamI think we should consider a config-ish entry for controlling that, for people who know they are behind a broken proxy20:18
jammwhudson: Anyway, other than maybe 5-10 GET requests for a couple files, everything else is a readv()20:19
jamwe use it on both indexes and raw content20:19
mwhudsonok, that's what i thought20:19
vilajam: the squid bug doesn't occur so often AFAICT and is fixed in recent versions20:19
jamI would *like* to see launchpad implementing bzr+http20:19
vilajam: +120:20
lifelesssquid bug is fixed in all supported versions; just some folk are bad about upgrading20:20
mwhudsonjam: that would be nice, yes20:20
jamvila: what are you still doing around ? :)20:20
mwhudsoni get faintly terrified by resource consumption20:20
mwhudsonbut that's step 2, anyway20:20
vilajam: ponging mwhudson :-)20:20
jamvila: when *I* work until after 10pm, its because I'm home all alone. I didn't think you had the same excuse20:21
vilaI don't, just back from restaurant and showing blinking icon to gf: look ! They're pinping again !20:22
vilapinging even20:22
jamSeems like you respond a bit too much to the little blinking icon :)20:22
jamI'll keep it in mind20:22
mwhudsonvila: sorry for disturbing your evening20:23
vilamwhudson: don't worry, I won't stay there :-)20:23
jamvila, vila, vila: please pay attention to me :)20:23
vilajam: I already voted tweak to your chunked patch :)20:24
jamSorry, but my wife and son are away for a month...20:24
mm-mysqljam: Ah, hi.20:27
mm-mysqlSorry.20:27
jamhi mm-mysql20:27
mm-mysqlI was going to get back to you about *this* week, but unfortunately, I had a death in the family (grandma, not unexpected, totally, but still busy because of it), and a release to get out the door20:28
mm-mysqlWhat does next week look like for you?20:28
* mm-mysql pulls up the calendar20:28
jammm-mysql: I'm very sorry to hear that.20:28
jamNext week I'm probably going to be out of town.20:28
mm-mysqlAh.20:29
mm-mysqlOkay, so....20:29
mm-mysqlIt's the week of xmas, what about the 22nd?20:29
jamshould be fine by my calendar (it is pretty much wide open :)20:30
mm-mysqlLet's pencil that in?20:31
mm-mysqlWhere/when would you like to meet?20:31
jamsure20:31
jamAnywhere/anytime :)20:31
mm-mysqlheh.20:31
jamPanera or the Brewery are both fun places20:31
jamlunch or dinner is fine20:32
mm-mysqlLet's do the brewery, lunch?20:32
mm-mysqlHigh noon, or?20:32
jamsounds good.20:32
jamaround noon20:32
mm-mysqlOkay. You're on the calendar.20:32
jamI'll see you at the Brewery, around 12 noon, on Dec 22nd.20:33
vilamwhudson: a word of caution about bzrlib/tests/http_server.py, look at it for features, not implementation, it's nowhere near to be optimized (quite the opposite even as it's the base for all sort of torture test servers, so the emphasis is on easy extension/redefinition rather than performance)20:39
mwhudsonvila: sure, i think i'm probably going to start with something from twisted20:39
lifelessmwhudson: have you considered a j-i-t mapping lookup, feeding the result into the mod-rewrite core?20:42
* emmajane submits her first-ever bzr bug.20:42
mwhudsonlifeless: you mean the "prg" rewritemap thing, or however it's spelt?20:43
mwhudsonyeah20:43
mwhudsonit's another option, no decisions as yes20:43
mwhudsonyet20:43
DevourerIs there a way to convert a Mercurial repository to a Bazaar repository?20:49
lifelessDevourer: you can you hg fast-export and bzr ast-import quite easily20:51
lifeless*fast-import*20:51
jelmerhi abentley, poolie21:56
abentleyjelmer: Hi.21:59
meoblast001hi22:14
meoblast001does pushing a large revision often say 0/0 for a long time?22:24
meoblast001how do i drop a revision22:25
meoblast001i dont want to change any files22:25
meoblast001i just want to delete revision 222:25
meoblast001i really messed it up22:25
bob2you can't, really22:25
bob2you could branch from r1 and merge r3... into it22:25
meoblast001ok i'll just delete the files and recommit22:26
bob2that won't remove them from the history, though22:26
meoblast001revision 2 has too many files and it hangs trying to upload them22:27
bob2you might just need to wait longer22:27
meoblast001i put wxGTK and wxMozilla in it22:27
meoblast001im not supposed to do that right?22:27
bob2no22:27
meoblast001yeah22:27
meoblast001exactly22:28
meoblast001bob2: i broke bazaar22:30
meoblast001bzr: ERROR: Could not acquire lock "(remote lock)"22:30
meoblast001what do i do?22:30
meoblast001bob2: im about ready to hit myself in anger22:32
Peng_meoblast001: If you're absolutely sure the branch/repo isn't actually in use, you can use "bzr break-lock $the_url" to unlock it.22:34
meoblast001ok22:34
meoblast001thanx22:34
meoblast001i know its not22:34
meoblast001no one ever uses it22:34
Peng_meoblast001: You do. :)22:35
meoblast001i dont  want to push revision 222:36
meoblast001only revision 322:36
meoblast001revision 2 has too much for my internet connection to handle22:37
meoblast001Peng_, is this imposible? if it is im gonna hit a wall or something22:38
Peng_meoblast001: More or less, no. It would be easiest to uncommit revisions 2 and 3, delete the stuff from 2 and recommit 3.22:39
meoblast001ok22:39
meoblast001how do i uncommit?22:40
meoblast001i hate timelimits22:40
jammeoblast001: bzr uncommit -r122:40
Peng_"bzr uncommit" :D22:40
jamto commit *to 1*22:40
jamyou'll probably want to follow that with "bzr revert" to stop versioning mozilla and wx22:40
jameither revert everything, or just parts of the tree22:40
meoblast001thanx22:41
meoblast001i always forget this stuff22:42
meoblast001i gtg though22:42
meoblast001bye22:42
emmajanespiv, heh. "This space left intentionally blank."23:50
spivemmajane: pretty much :)23:54
emmajaneI like it. :)23:54
emmajaneI'd been getting random errors on .bzr/repository/obsolete_packs/': as well. But it wasn't anything I could reproduce reliably so I hadn't reported it yet.23:55
emmajaneIt sounds like that might be the same problem though?23:55
spivRight.23:55
emmajanesometimes it's a problem, and then 2 seconds later I run the same commit again, and it's fine.23:55
spivIt's an often empty directory, but whenever packs are repacked (which happens automatically every so often) then you'll get that error.23:56
emmajaneah23:56
emmajaneyes, "every so often"23:56
spiv"every so often" == every 10 commits, if commits are all you do (rather than pushing/pulling into the repo, say)23:56
emmajane"random" problems are a little bit infuriating. :)23:57
jmllifeless: is it a bug that for looms, 'switch' will change threads when there are uncommitted changes, but 'down-thread' won't?23:57
jmllifeless: (hint: yes)23:57
emmajanespiv, commits and uploads.23:57
spivjml: down-thread won't?23:57
emmajanespiv, I'm in the middle of tweaking CSS files...23:57
lifelessjml: no23:57
spivjml: I thought it did...23:57
spiv(but I guess I haven't tried doing that)23:58
lifelessjml: I thought about it hard when merging abentley's branch, and its correct23:58
jmllifeless: it's also causing me lots of problems.23:58
lifelessjml: now is not a great time to discuss; but think about the issues of going down-thread with a pending merge - down-thread is recommended for various workflows23:58
lifelessjml: alternative safety nets are good23:59
lifelessas in, I'd like alternatives23:59
jmllifeless: I want switch to stop me from switching unless I pass a --yes-i-know-what-im-doing flag23:59
jmlthat would give me options23:59
jmlbut as you say, we can discuss later.23:59
jmllifeless: I'll review your branches now, btw.23:59
emmajaneIt took me a while (and a lot of face on desk smashing) to figure out that "uploads" the directory is in no way related to the plugin uploads.23:59
emmajaneand we won't talk about the .bzr folders that I just plain old deleted assuming it was corrupt.23:59

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