/srv/irclogs.ubuntu.com/2008/07/15/#bzr.txt

Manfregive the following situation, I create a local branch, make changes and push those back up to lp, then some one else branches my changes and then pushing those back up to the same lp branch, how do I update my local branch without needing to do a merge?00:41
hmelandbzr pull?00:41
jelmercolbrac, still there?00:42
colbrac yes00:42
ManfreJust tried bzr pull and got "Bazaar has encountered an internal error"00:43
Manfrei guess i'll use the work around of delete local branch and rebranch00:43
bob2well, that's a bug (or corruption), but bzr pull is generally what you want00:43
colbracjelmer: ja00:43
Odd_BlokeManfre: Could you pastebin the error, please?00:43
Odd_Blokeubottu: paste00:43
ubottupastebin is a service to post multiple-lined texts so you don't flood the channel. The Ubuntu pastebin is at http://paste.ubuntu.com (make sure you give us the URL for your paste - see also the channel topic)00:43
jelmercolbrac: Just wanted to say thanks for the patches to bzr-gtk you sent over the last week or so.00:44
colbrac:) No problem00:44
jelmercolbrac: I'll see if I can review and merge some of them during the next couple of days00:45
colbracIt's kind of 'wetting my feet' in the world of gtk programming00:45
jelmerAh :-)00:45
colbracstart with the launch fix :)00:45
ManfreOdd_bloke: http://pastebin.com/d5435631000:45
Manfresorry, it was the bzr status call after the pull that caused problems00:46
Manfre...potentially00:46
colbracjelmer: and I try to use Olive in 'production'.. so deficiencies stand out :)00:46
Odd_BlokeManfre: That error looks familiar.  I'm fairly sure it's been fixed in bzr.dev...00:48
bob2#23565700:49
jelmercolbrac: Yeah, that helps00:49
jelmercolbrac: Personally, I try to use nautilus-bzr on a regular basis00:49
bob2though, you seemed to have pulled and merged the same branch - maybe undoing the merge will unconfuse bzr00:50
Odd_BlokeManfre: http://bugs.launchpad.net/bzr/+bug/23540700:50
ubottuLaunchpad bug 235407 in bzr "'pop(): dictionary is empty' in tsort when showing pending merges" [High,Fix released]00:50
colbracjelmer: Good for you guys I didn't try to use nautilus-bzr yet. ;)00:50
jelmer(-:00:50
colbracjelmer: I started on a pure PyGTK version of the olive gui.. I hope that sounds interesting?00:51
jelmercolbrac, what do you mean by that exactly?00:51
colbraca OliveGui class that builds the main window instead of the glade one00:52
Manfrethanks Odd_bloke00:52
colbracso self.vbox.add(menubar) etc00:52
colbrac:P00:52
Odd_BlokeManfre: No problem.00:52
jelmercolbrac: Ahh, yeah, that is certainly interesting00:52
colbraclp:~colbrac/bzr-gtk/noglade00:53
colbracstill very rough of course etc etc00:53
jelmercolbrac: Submitting that in small (but still usable) portions will probably help it being merged quickly, rather than a single big patch00:53
colbracwell..00:53
colbracI can make it such that it can be a drop in replacement of the glade one00:54
colbracI think at least :P00:54
ToyKeeperIf my viz changes are accepted, that scratches most of my bzr gui itches.  :)00:54
colbracToyKeeper: Did you play around with the diff positioning?00:55
colbracThe unsorted bookmarks were a big itch for me personally. :)00:55
ToyKeeperYeah, I haven't been able to find a layout I like better.00:55
ToyKeeperThe main change I'd still like to see is a way to view all branches in a repo at once, using viz.00:56
colbracjelmer: I don't really know how a full GUI can be merged in in bits..00:56
jelmercolbrac, there are different windows in olive for example00:56
colbracoh that..00:56
jelmerit makes sense to convert one window at a time00:56
colbracI did that00:56
jelmerand merge that separately00:56
colbracit's 1 big patch but with commits per dialog00:57
jelmerI agree the main window is probably pretty hard to convert in stages00:57
Odd_BlokeToyKeeper: +1 on the all branches view.00:57
colbracmost of the dialogs are done already00:57
colbraconly that info dialog looks hard so I didn't try it yet00:57
colbracThe olive dialogs cleanup -take3 message in the bzr-gtk list00:58
=== emgent_ is now known as emgent
jelmerOdd_Bloke, still there?01:15
colbracjelmer: I now have all widgets of the glade olive main window in a OliveGui class. Only to paste in the right signals and figure out how to properly reference the icons :)01:23
Odd_Blokejelmer: Yeah, though I suspect you may be gone by now. :)01:42
Odd_Blokejelmer: Now I'm going to bed, so it'll have to wait until the morning.01:48
mwhudsonis bzr really going to be released with a repo format called01:59
mwhudson'Bazaar development format 1 with subtree support (needs bzr.dev from before 1.6)\n'02:00
mwhudson?02:00
=== splodge is now known as cael
=== cael is now known as caelj
=== caelj is now known as splodge
abentleymwhudson: I hope not.03:05
mwhudsonabentley: good good03:06
=== sm_ is now known as sm
* igc lunch03:29
=== arjenAU2 is now known as arjenAU
brmassaguys, is there a program that tracks a CVS repo and imports the changes to bzr and the other way round?04:42
mwhudsoncvs->bzr yes04:44
mwhudsonnot the other way04:44
fullermdGoing either way is probably doable.  Both at the same time is another story.04:45
brmassamwhudson: so its not possible to commit to a bazaar branch and it replicates/pings the CVS?04:45
AfCYou can always do the "Create a Bazaar branch inside the CVS checkout and manually shuttle changes back and forth between the two systems"04:46
AfCManual04:46
brmassaAfC: hmmm not quite what i had in mind. well... np them.04:47
* mwhudson waves https://bugs.edge.launchpad.net/bzr/+bug/248604 around07:06
ubottuLaunchpad bug 248604 in bzr "locking repository makes no difference to speed of repeated get_revision calls" [Undecided,New]07:06
stewarthi! i'm trying to "bzr merge" from a file that contains a merge directive - and i get  "bzr: ERROR: bzrlib.errors.NoSuchRevision: KnitPackRepository('file:///home/stewart/mysql/.bzr/repository/') has no revision ('volpato@cajarana-20080715052545-2fu5im6ll8o2jr6x',)"07:13
stewartnow... does this mean the merge directive is incomplete, corrupt? against a tree i don't have?07:13
stewartor a bzr bug07:13
lifelessstewart: it means it was made against a rev you don't have - probably something in the 6.0 trunk to some such07:14
stewartlifeless: ahh.. okay. the error message could probably be nicer (or at least on the same screen :)07:15
stewartit's like 3 pages of python backtrace up07:15
lifelessstewart: ouch; cxare to file a bug ?07:15
stewartcan do07:15
* stewart field bug... waits for magic irc bot to say it's done07:17
igcnight all08:45
gourigc: night08:46
=== weigon__ is now known as weigon
lifelesspoolie: ping09:19
Odd_BlokeMoin.09:34
kiorkyhello, with bzr svn, is this possible to use local svn check outs as a start ?09:40
lifelesskiorky: yes09:40
kiorkylifeless: do you have any clue or pointer on how to do that?09:40
lifelesskiorky: cd to the checkout, start running bzr commands09:41
* AfC does that rather frequently, not always wanting to import everything and therefore not needing to use bzr-svn et al09:41
kiorkythen how can i map the svn/bzr thing for commiting back to the svn repo?09:43
kiorkywhen i commit on bzr09:43
kiorkys/commit/push/09:43
lifelesskiorky: 'bzr checkout svn://url FOO; cd FOO; bzr merge BZRBRANCH; bzr commit'09:44
lifelesskiorky: (you need a bzr native tree to do merges in (as far as I  know, jelmer may know more)09:44
kiorkylifeless: ha, i dont know if i was clear on what i wanted to do. I have a svn co somewhere , telling its in "foo", but not yet bzr stuff. Rather than doing bzr co svn://myuri FOO, i want to use bzr inside the svn's foo one directly, saving me from co-time as i have it allready09:46
lifelesskiorky: you can do that, but as far as I know you can't run one specific bzr command - merge - because svn checkouts don't have a place to store pending merge data09:47
kiorkylifeless: so the only way to go is to co again?09:49
lifelesskiorky: yes. but once you have done that you can branch locally from it and it won't have to fetch it over the network again09:49
Odd_Blokeubottu: paste09:57
ubottupastebin is a service to post multiple-lined texts so you don't flood the channel. The Ubuntu pastebin is at http://paste.ubuntu.com (make sure you give us the URL for your paste - see also the channel topic)09:57
lifelessOdd_Bloke: ?09:58
Odd_Blokelifeless: I was going to paste something, then changed my mind. :)10:04
lifelessOdd_Bloke: :)10:05
jelmer'morning10:07
lifelessjelmer: can you bzr merge in a svn co?10:08
jelmerlifeless, no, since there10:09
jelmer*since it's not possible for merge to pull revisions into the local repository10:09
jelmerOdd_Bloke, still there?10:10
lifelessjelmer: righto10:10
lifelessjelmer: could create a pending-merge micro-repo :)10:11
jelmerlifeless, yes, but that requires me to detect how the repo is being used10:12
Odd_Blokejelmer: Yup.10:12
lifelessjelmer: I mean in e.g. .svn/pending-merges-repo10:12
abentleylifeless: did you see bug 248506?10:40
ubottuLaunchpad bug 248506 in bzr "stacked fetch fails to copy required revisions" [Critical,Confirmed] https://launchpad.net/bugs/24850610:40
lifelessabentley: no I hadn't10:41
abentleyI tried to figure out the exact issue, but I got a little lost.  Can Packer use a fallback repository?10:42
kiorkyjelmer: uhm i get problems10:43
kiorkyjelmer: ImportError: cannot import name make_file_factory10:43
kiorkyjelmer: with svn 1.5, and its binding, bzr1.6 or 1.5 and the stable branch10:43
lifelessabentley: no, what I was thinking was to use the generic VF implementation when pulling into a stacked environment; it should perform m~= these days10:43
kiorkyjelmer: (when doing bzr svn-import URI)10:44
abentleylifeless: The current implementation is using Packer for fetch, so that appears to be why it's failing.10:44
kiorkyjelmer: http://www.friendpaste.com/SLCdppAS10:45
lifelessabentley: I suggest doing a check that neither source nor target have fallback repos in the interpackrepo thing10:51
kiorkylifeless: do you have any idea on my import problem? ABI changed ?10:53
lifelesskiorky: svn wbzr-svn head needs bzr.dev head10:54
kiorkylifeless: Ha ok :)10:54
kiorkylifeless: there is no way to have svn integration with stable releases ? (even with previous version or bzr svn)10:56
lifelesskiorky: yes, but you can't use the head of the branch, you need some commits back; jelmer: ^^11:03
lifelesskiorky: (I really want bzr-svn in the ppa to address this, its being discussed on list at the moment)11:03
kiorkylifeless: another thing im now using bzr head11:06
kiorkylifeless: but now i cant authenticate with the svn repo11:06
kiorkyit just fails :p11:06
lifelesskiorky: if you are using bzr head, then bzr-svn head should work - but you'll need to run make in the bzr-svn dir11:06
kiorkylifeless: i mean there is maybe some configuration spoemwhere to get the crendentials info?11:06
kiorkylifeless: yep, that what i had done11:06
kiorkynow, on import, i cant authenticate :)11:07
kiorkylifeless: jelmer uhm, i dont suceed in making bzr svn-import run11:23
kiorkyeither i get authenticate problems, or when i put the creds in the url i get : "RROR: Not a branch:"11:24
kiorkyeven on non auth'd enabled servers11:25
=== abentley1 is now known as abentley
kiorky(i tried to co the svn repo)11:25
lifelesskiorky: hi, have you checked the FAQ?11:35
Necorohey - I've a project - and I deleted a file about 100revs ago.13:10
NecoroIs there a way to get it back, w/o having to scan through history manually looking for the revision where I deleted it?13:10
LeoNerdMaybe  bzr log path/to/file  will find you the commit where you removed it?13:11
Necoronope13:12
pygiNecoro, "bzr revert file" might work13:12
pyginot 100% sure tho13:12
Necoropygi: bzr: ERROR: Path(s) are not versioned =/13:13
pygieh, yes, that's only for non-commited stuff13:14
* pygi thinks13:14
Necorohmm ... ok ... "bzr diff -r1.." at least gives me the date where I deleted it =)13:15
Necorohmm ... no13:17
pygiNecoro, bzr revert -r123 some_file should actually do the trick13:17
fullermdYou need to "revert -r<rev_before_deleted>" to bring it back.13:17
pygias long as you know the revision13:17
Necorobut I do not know the revision ;) - that's the problem13:17
fullermdBut there's no way to find the rev other than "log -v | less ; <search for filename>13:17
NecoroI just could use "-r1" but don't know I changed something in between -r1 and -r$deleted13:17
bob2bzr log should be ablt to take a file id13:18
Odd_BlokeNecoro: You could use the bisect plugin.13:22
lifelessNecoro: bzr revert -r -100 FOO13:23
lifelessNecoro: or bzr log -v | less, then /filename13:23
Necorolifeless: the latter one works :) - though it isn't as automagic as I thought ;)13:26
Odd_BlokeNecoro: If you branch http://bzr.daniel-watkins.co.uk/bisect/automated/ into ~/.plugins/bisect and then do 'bzr bisect run stat <filename>'.13:27
NecoroOdd_Bloke: can't branch from inside the company (damn proxy/firewall -.-) ... is there a difference to the lp:bzr-bisect ?13:30
Odd_BlokeNecoro: Yeah, there is.  Would it help if I pushed it to LP?13:38
Necoroyes - this would be really helpful - because from LP i can branch using bzr+ssh - so there is no HTTP-Proxy in the way doing stupid things :)13:39
Odd_BlokeNecoro: https://code.launchpad.net/~daniel-thewatkins/bzr-bisect/automated13:40
awilkinsYegods, my sysadmins are morons.13:41
awilkins"Hey, poke a hole in the firewall to let SSH in or I'll have to set up a relatively insecure WSGI gateway app"13:41
awilkins"I'm sorry, we can't do that for security reasons"£13:42
* awilkins slaps forehead13:42
_panebis there a way to see the parent of a branch?13:43
_paneb(i am about to do bzr merge)13:43
NecoroOdd_Bloke: thanks - branching worked ;) - but running the command yields: http://rafb.net/p/ZDDJkI98.html13:44
Necoroor do I have to do certain things before I'm able to run it?13:45
bob2_paneb: bzr info?13:45
_panebok13:45
Necoroand btw:  bzr bisect deletes uncommitted changes w/o notice ;)13:47
awilkinsNecoro: That's a bug ; needs reporting13:50
Odd_BlokeNecoro: Apologies, I didn't realise.13:53
NecoroOdd_Bloke: no problem - nothing lost which can't be reproduced using zsh history ^^13:54
Odd_BlokeAnd I probably meant 'bzr bisect run "stat <filename"'.13:54
Odd_BlokeNecoro: ^13:54
NecoroOdd_Bloke:  http://rafb.net/p/Q9POdw13.html ... still not works13:56
Necorooh - wrong paste13:56
Necorothat's the one -> http://rafb.net/p/MrtUS580.html13:57
Odd_BlokeNecoro: OK, you actually want the opposite of what stat does.  I'm not sure of the best way to do that.13:59
Odd_BlokeNecoro: Try 'bzr bisect run "test ! -e <filename>"'.14:01
NecoroOdd_Bloke: wohoo :) works14:02
Odd_Bloke\o/14:03
Necorothanks a lot :)14:03
Odd_BlokeNecoro: No worries.  It's nice to finally have a real-life use case for that stuff. :)14:03
Necorohehe =D14:04
Necorodo you think it is possible to put this in one command? - so like: bzr undelete <filename> ?14:07
Odd_BlokeNecoro: I would imagine that'd be possible in a plugin, but I'm not sure if it's a common-enough use case for much more than that...14:13
lifelessNecoro: I think we should make getting at the file more easy14:15
lifelessNecoro: 'bzr revert -r xxx foo' *is* undelete already14:15
lifelessNecoro: so, I think a mode to revert to search for a file, or some means to search for it would bbe sufficient14:16
* pygi thinks that might be god way to contribute something :)14:20
* fullermd imagines "bzr path-history <path>"...14:23
lifelessfullermd: bzr search path14:36
=== mw|out is now known as mw
Necorolifeless: that's true -- but plugins aren't able to overload existing commands, are they?14:54
LarstiQNecoro: they are15:02
Necorook :)15:02
LarstiQNecoro: but that can be problematic if you have more than one plugin trying to override the default15:02
awilkinsI think some of the builtins could stand being refactored into multiple routines that you could overload in plugins15:09
awilkinsOr even provide extension points for them15:10
lifelessawilkins: indeed15:18
PengGetting information for AnnotateUI: 118.64552807807922 secs :D15:23
PengHmm, how do you do a graceful shutdown of Loggerhead?15:24
PengI managed to shut it down in the middle of a request.15:24
lifelessPeng: no idea sorry15:27
=== thekorn_ is now known as thekorn
awilkinsCan bzr+http:// do certificate authentication?15:30
PengMy question is probably more of a Paste question anyway.15:31
lifelessawilkins: vila: knows15:31
lifelessvila: do we have docs for easy answers on this15:31
PengI hit Ctrl+C, and it did a mostly graceful shutdown: that 118 seconds request actually completed several seconds after all of the other worker threads had been shut down. But then the web server log reports a second request came in at the same time and got dropped on the floor.15:32
uwsHmm. bzr just ate ALL my RAM15:32
uwsalmost all 1280 MB of it15:32
awilkinsI should learn to open my beak less on the "security" issue15:32
vilano, but hopefully I will address that soon (when I get back from vacations in 3 1/2 weeks :)15:32
awilkinsvila: Can it do digest?15:32
PengIs Python's SSL support smart enough to do that?15:32
vilaawilkins: if you use the pycurl http implementation it will verify certificates15:32
awilkinsvila: Server, yes, client also?15:33
vilaawilkins: digest is supported15:33
vilaawilkins: client certificates ? No. But I'd like to add that too once urllib https implementation knows how to do server certificate verification (including option for self-certified)15:34
awilkinsOk then, guess I'm going with digest for the time being :-)15:34
uwsjelmer: bzr-svn eats all my memory15:35
Penguws: What version?15:35
uwsjelmer: Can I convert a large SVN repo to bzr+svn stuff in chunks?15:35
Penguws: Yes. I always do that.15:36
uws0.4.1015:36
awilkinsuws: Yes, I wrote a script to do it 1000 revs at a time15:36
uwsI had to hard-reset my machine15:36
uwsIs there a way I can "continue" the previous branching/15:36
uwsI'm using a repos --rich-root-pack and branched http://...../trunk into "project.trunk"15:37
awilkinsuws: cd project.trunk ; bzr pull http://.....trunk15:37
uwswebkit is quite a large project ;)15:38
Penguws: The next version of bzr-svn (possibly paired with svn 1.5) will leak a lot less.15:39
uwsI already run svn 1.5.015:39
awilkinsuws : https://launchpad.net/projects/?text=webkit15:39
uwsawilkins: Hmmm. How can i branch that?15:42
uwsawilkins: bzr branch lp:~vcs-imports/webkit-open-source/trunk  doesn't work15:43
uwsawilkins: ah, it's not imported it seems https://code.launchpad.net/webkit-open-source15:44
awilkinsAh well, it was a good try :-)_15:45
uwsso where's that rev pulling thingy?15:45
awilkinsuws: It's a powershell script, you probably don't want that ; it's not hard, write a loop, initialise a value with the output of bzr revno, add a few hundred, and pull up to that value.15:46
uwsawilkins: this'll do for now hopefull:      for revno in $(seq 100 1000 35000 ); do bzr pull --verbose svn+http://svn.webkit.org/repository/webkit/trunk -r $revno; done15:57
=== davi__ is now known as da
=== da is now known as davi
Odd_Blokejelmer: When are you going to be arriving on Wednesday?16:23
andresjhey how do I get the latest bzr-svn for Ubuntu? The currently available is bzr-svn0.4.9, and its not compatible with bzr1.5... Can anybody add it to the PPA?18:43
ToyKeeperandresj: I know this isn't the greatest answer, but you could branch the latest versions from launchpad and use bzr.dev.18:46
andresjToyKeeper: I don't really know what you mean. :P18:47
ToyKeeperBasically, you could install from source instead of a .deb.  But I don't know enough about your situation to know if this is appropriate.18:48
andresjToyKeeper: oh well I guess I could do that... but is there really no bzr-svn package available?18:49
ToyKeeperThere may be a newer one in debian/testing or debian/unstable, and possibly in a PPA.18:50
ToyKeeperI just havent looked, since I want the latest bzr.dev to make patches against.  It's easier for me to 'bzr pull' updates than install packages.18:52
andresjoh haha ok :) no i dont develop bzr :P   well I guess i'll keep looking or if not install from source. thanks ToyKeeper :)18:53
ToyKeeperandresj: If you decide to go that way, the "Run from source directory" section here may help: http://bazaar-vcs.org/InstallationFaq18:56
andresjToyKeeper: allright thanks I'll check it out :)18:56
ToyKeeperYou can run bzr.dev and every plugin (that I've tried) from source dirs, without needing to actually install them.  Just add a symlink and it's done.18:56
lifelessandresj: we're working on the PPA; the list has the current status18:56
andresjlifeless: oh cool where is the list? :)18:58
andresjToyKeeper: oh wow thats cool this is one of the few programs that can do that in my expierence :D18:59
ToyKeeperIn some cases, running "make" is also required.  (including bzr-svn)  And you'll of course need to provide any dependencies.19:02
andresjof course :)19:02
=== mw is now known as mw|food
lakshmanani have a problem with bazaar while pushing my changes to the launchpad branch.... thisis the error message   bzr: ERROR: Transport operation not possible: http does not support mkdir()19:41
lakshmanani have a problem with bazaar while pushing my changes to the launchpad branch.... thisis the error message   bzr: ERROR: Transport operation not possible: http does not support mkdir()19:42
beunolakshmanan, have you done:  bzr launchpad-login your_username?19:42
=== \sh is now known as LeonovShuttle
lakshmananbut the error messge is somthing different...19:43
beunolakshmanan, yes, that error message is because you're trying to push through http19:43
lakshmananok.. so what should i do19:43
beunoyou're probablt using lp:location19:43
beunolakshmanan, what's your username in Launchpad?19:43
lakshmanani enter an email id to login my account19:44
=== LeonovShuttle is now known as \sh
beunolakshmanan, right, but you should also have a username19:44
lakshmananthere are two names.. that i have given.. one is display name ->lakshmanan and the other is just a name(as i see in my 'change details' page) -> lak8919:45
beunolakshmanan, is this you?  https://launchpad.net/~lak8919:46
lakshmananyes19:46
beunoif it is, then, run:  bzr launchpad-login lak8919:46
beunowhat exact command are you using to push?19:47
lakshmanani use bzr push <branch location>19:48
luks<branch location> is the important part you should paste :)19:48
lakshmananbeuno, i ran bzr launchpad-login lak89.... it didn't say anythng... my prompt came back19:50
lakshmananbeuno, i did paste the branch location correctly19:51
beunolakshmanan, ok, try pushing now19:51
lakshmananbeuno,  i did it... it said this "The authenticity of host 'bazaar.launchpad.net (91.189.94.254)' can't be established. Are you sure you want to continue connecting (yes/no)?19:52
lakshmanan"19:52
beunolakshmanan, say yes  :)19:53
lakshmananbeuno, bzr: ERROR: Target directory lp:~lak89/getedit/mine already exists, but does not have a valid .bzr directory. Supply --use-existing-dir to push there anyway.19:54
lakshmanan.............this is what it is saying19:54
beunolakshmanan, right, do:   bzr push lp:~lak89/getedit/mine --use-existing-dir19:55
beunothis won't happen from now on, because you've specified your launchpad ID19:55
lakshmananbeuno, what is the correct way of pushn to a branch.. is this so tedious like this everytime19:56
beunolakshmanan, no, again, this happened now because you didn't have your launchpad ID set19:56
beunofrom now on, it's just:  bzr push [location]19:56
lakshmananbeuno, that is if i use that directory for all the puch operations... what if i move to another directory, initialize bzr and push from there ??19:57
beunolakshmanan, this is system-wide19:58
beunoso it will just be push19:58
beunothis is a one time thing you have to do19:58
beunoto use   lp:location   URLs19:58
beunohaving your username set, it uses ssh instead of http, so it can perform write operations19:59
lakshmananbeuno, ok .. actually what went wrong in my steps... what did/might have do/done wrong in my previous attempts...if any... what should i do from now on20:00
beunolakshmanan, from now on, just use:  bzr push location20:01
lakshmananbeuno, ok... but everytime.. i restart... should i set this username thing20:01
beunoyou didn't have launchpad-login specified, and you had already tried to push via http, which creates an empty dir (it's a bug in Launchpad), so you have to specify the --use-existing-dir flag20:02
beunolakshmanan, you will have to specify that again if you reinstall, or use it from a different user on the system20:02
lakshmananok20:02
lakshmananbrb.. thanks20:03
beunowelcome'20:03
Kinnisonlifeless: that compression stuff looks very interesting20:06
=== mw|food is now known as mw
lifelessKinnison: :)20:19
lifelessKinnison: play!20:19
PengIs it just me, or is the lp branch "pybloom", not "bzr-pybloom"?20:22
Kinnisonlifeless: tempting, but I'm busy writing READMEs and tests for my templating library20:23
dashwhat's the current state of bzr-svn? anybody know if bzr-svn 0.4.10 has problems with svn 1.5?20:23
dashlooks like current bzr-svn requires current bzr as well20:25
PengUh, there's an svn 1.5 compatibility branch.20:26
PengI don't know much else though.20:26
PengAnd yes, bzr-svn's 0.4 branch requires bzr.dev.20:26
Verterokdash: are you usign bzr-svn from source?20:27
dashVerterok: was trying to :)20:28
Verterokin that case I think you need install the subversion-dev package from your distro20:28
dashyep, got that20:28
dashgetting an error from libsvn though20:28
Verterokdash: bzr-svn now provide it's own python bindings to subversion20:28
Verterokso you need to compile them against your installed subversion20:29
dashVerterok: even 0.4.10?20:30
Verterokdash: I don't know, let me check20:30
dashbecause i'm not seeing any C files in there20:30
dashspecifically, attempting to branch from an svn url gets me this:20:31
dashpython: /build/buildd/subversion-1.5.0dfsg1/subversion/libsvn_ra/ra_loader.c:973: svn_ra_get_log: `Assertion *path != '/'' failed.20:31
Verterokdash: I encountered a similar error while trying to build it for Mac OS X20:32
Verterokdash: are  you building subversion-1.5 from sources?20:33
dashno20:33
dashusing the package in intrepid20:34
Verterokdash: I think that error is caused by a minor version number in the subverison build20:34
dashyeah apparently the api changed in 1.520:35
dashguess i'll downgrade20:35
Verterokdash: bzr-svn branch (0.4) contains the c files20:36
Verterokdash: https://code.launchpad.net/~jelmer/bzr-svn/0.420:36
dashyeah I just tried that20:37
dashit doesn't work with bzr 1.5 though :)20:37
Verterokdash: time to fill a bug them :)20:42
dashVerterok: why's that? Peng just said it depends on bzr.dev20:43
Verterokoh, sorry I missed that20:45
Verterokdash: I assumed svn-1.5 :P20:46
PengWell, I mean, I don't know if it's intentional, but it's the case at the moment.20:46
dashbzr 1.6 will be along soon enough20:48
dashI can deal with bzr-svn 0.4.10 until then. :)20:48
dashhm. so bzr has the idea of a branch attribute called the 'submit branch'. for a workflow that creates branches for specific features/issues, do I understand it correctly to be "the branch this one should be merged into, once it's done"?21:19
pickscrapeHi, are there any good instructions out there for building debian/ubuntu packages for bzr plugins?21:35
pygiso folks, welome cheezeburger :)22:03
pygia bzr repositories serving tool :)22:04
* pickscrape pricks his ears up22:05
pickscrapeRead-only serving or read/write?22:05
matkorDoes making bzr checkout <remote_branch> downloads full diff history ?22:05
dashmatkor: yes. "bzr checkout --lightweight" does not.22:06
matkorok.. is it possible to "cut down" given branch history ? Let's I am only interested to have hisory since given revision (make given revision first one) ?22:08
dashmatkor: 1.6 is going to allow something like that, I believe22:08
dash'stacked branches'22:08
pygipickscrape, read-write22:14
pygipickscrape, it allows easily setting up bzr repositories and access management to them22:14
pickscrapepygi: does it use the smart server?22:14
pygiprobably yes, still gotta see =)22:14
pygiit's just an idea I got today, and registered a project22:15
pickscrapepygi: Then it sounds very interesting indeed.22:15
pickscrapepygi: I'll watch your project with great interest :)22:16
pygi:)22:16
pickscrapeSorry to ask again, but can someone point me at some docs on packaging bzr plugins for debian/ubuntu?22:18
pygihmmm22:18
pygihere's an idea22:19
pygiapt-get source bla-package22:19
pygiwhere bla-package is some bzr plugin, and you can see how it's done22:19
pygithen if you have any questions, I can probably help22:19
asabilpygi: where is the code for cheeseburger ?22:19
asabil:D22:19
pygiasabil, cheezeburger* :)22:20
pygiasabil, in my head, does that work for you? xD22:20
asabillol22:20
pickscrapeI'm looking in bzr-svn's checkout now, but don't see anything to do with packaging (I'm not at all familiar with debian packages so I really don't know what I'm looking for)22:20
asabilsorry, cheezeburger22:20
pygipickscrape, debian directory22:20
dashpickscrape: it wouldn't be in the checkout, i bet22:20
chxheya. here is a challenge. i would like to put my daily database dumps into some RCS. the file is like 10G. Also, I wonder whether there is a way to throw away old revisions after some time22:20
pickscrapeYeah, there isn't a debian directory here22:21
asabilpygi: looking forward to see the real thing22:21
dashpickscrape: that stuff is usually kept as a patch22:21
pygiasabil, :)22:21
dashpickscrape: apt-get source will fetch it22:21
pickscrapedash: thanks, I'll try that out22:21
dashchx: if you're just versioning a single blob, maybe xdelta or git would serve you better22:21
pygichx, ehm, that's not so nice, but ...22:21
chxnot a blob. text file.22:21
chxi have a LOT of data.22:21
chxand then some.22:22
pygia blob actually is any file :P22:22
chxokay, okay22:22
dashchx: question is, what operations do you want to perform22:22
chxin databases blob is a binary large object ;)22:22
chxdash: commit22:22
dashchx: is that all? :)22:22
chxdash: when the database server dies under every other blue moon , checkout.22:22
pickscrapedash: thanks, that has revealed it :)22:22
dashchx: i'd just keep a list of diffs22:22
pygiasabil, do you have a use case? :)22:22
chxdash: yes. that's all. and, sometimes it'd be great to throw out old stuff.22:22
dashchx: yep. you want a backup system, not an RCS :)22:23
chxwell, no22:23
asabilpygi: it's about hosting/managing/serving bzr branches right ?22:23
chxAn RCS sounds to me like the ideal stuff for this22:23
pygiasabil, yup22:23
chxafter all22:23
chxi have a file that grows.22:23
chxand, if we have the dump in an RCS who knows what useful things we can do?22:23
chxtag it before a big rollout?22:23
dashchx: RCSes have to support a lot more operations22:23
chxwhy not.22:23
dashchx: like, not forgetting history :)22:24
chxdash: I ... know.22:24
asabilpygi: something like launchpad's bzr support would be just awesome22:24
chxdash: i know.22:24
chxdash: i was wondering whether graft would be useable here.. just wondering.22:24
pygiasabil, it's not any kind of UI, rather just a server side tool22:24
pygiyou got that part, right? :)22:24
asabilpygi: I would want both :p22:25
pickscrapepygi: so in a very loose sense, it's like a bzr equivalent of svnserve?22:25
pygiasabil, I agree, but for UI stuff I need help :P22:25
pygipickscrape, ehm, it's something similar to gitosis if you're familiar with it?22:25
asabil=_=22:25
pickscrapepygi: I'm not actually. Gave up on git when my head started to melt, came here and haven't really looked back22:26
pickscrapeI'll read up on it though22:26
pygipickscrape, lemme get a link for you22:26
pygihttp://scie.nti.st/2007/11/14/hosting-git-repositories-the-easy-and-secure-way22:26
chxdash: xdelta...?22:26
pygiasabil, if you wanna help tho ... :)22:27
asabilpygi: just design it so that a UI can be added on top22:28
asabilpygi: I am afraid am really not skilled with UIs22:28
dashchx: never mind, thought it was a binary22:28
chxno, no22:28
chxjust a "small" textfiel22:28
chxthat gives me a ton of headaches22:29
pygiasabil, ofcourse, didn't thought of doing it any other way :)22:29
=== BasicPRO is now known as BasicOSX
* pygi goes back to writing some git stuff22:34
tcaI'm running bzr selftest after I added a small patch for a ghost revision problem. How should I know if any of the test breakages are caused by my patch? Run selftest before and after and compare broken tests?22:44
mwhudsonwell, 'the tests always pass on trunk'22:45
mwhudsonso if you're seeing failing tests, it's very very likely you introduced them22:46
mwhudsonbut i guess running in a pristine bzr.dev branch first would be good to confirm this22:46
* luks would change that to 'the tests usually pass on ubuntu/linux machines'22:46
luks(with en_* locale)22:47
mwhudsonwell, yes22:49
=== herb__ is now known as herb
Odd_Blokepygi: What do you envisage cheezeburger doing?  And shouldn't it be 'cheezburger'?22:56
colbracanybody an idea how to set an icon on a gtk.Window so that it shows up as a big icon in the app switcher (alt-tab)22:58
colbracor is this something missing in pygtk?22:59
lukscolbrac: http://www.pygtk.org/docs/pygtk/class-gtkwindow.html#method-gtkwindow--set-icon-list ?23:01
pygiOdd_Bloke, possible, yes, I messed it up :P23:03
jamluks: and --no-plugins23:04
colbracluks: thanks, I've been looking all over that page but this seems worth a try23:04
pygiOdd_Bloke, well, keeping ssh keys for people who have commit access to some repo, managing access to repos, coordinating with some web interface for bzr repos, and stuff23:05
colbracwoohoo! That worked :) Olive now has an icon in the switcher :D23:08
Odd_Blokepygi: Do you mean repos or branches?23:10
pygiOdd_Bloke, ehm, well, branches23:11
f0ghornanyone have thoughts on https://bugs.launchpad.net/bzr-svn/+bug/248289 ?23:14
ubottuLaunchpad bug 248289 in bzr-svn "concurrent access problems" [Undecided,New]23:14
Odd_Blokejelmer: ^23:15
igcigc23:52
igcmorning23:52

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