[00:41] give 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] bzr pull? [00:42] colbrac, still there? [00:42] yes [00:43] Just tried bzr pull and got "Bazaar has encountered an internal error" [00:43] i guess i'll use the work around of delete local branch and rebranch [00:43] well, that's a bug (or corruption), but bzr pull is generally what you want [00:43] jelmer: ja [00:43] Manfre: Could you pastebin the error, please? [00:43] ubottu: paste [00:43] pastebin 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:44] colbrac: Just wanted to say thanks for the patches to bzr-gtk you sent over the last week or so. [00:44] :) No problem [00:45] colbrac: I'll see if I can review and merge some of them during the next couple of days [00:45] It's kind of 'wetting my feet' in the world of gtk programming [00:45] Ah :-) [00:45] start with the launch fix :) [00:45] Odd_bloke: http://pastebin.com/d54356310 [00:46] sorry, it was the bzr status call after the pull that caused problems [00:46] ...potentially [00:46] jelmer: and I try to use Olive in 'production'.. so deficiencies stand out :) [00:48] Manfre: That error looks familiar. I'm fairly sure it's been fixed in bzr.dev... [00:49] #235657 [00:49] colbrac: Yeah, that helps [00:49] colbrac: Personally, I try to use nautilus-bzr on a regular basis [00:50] though, you seemed to have pulled and merged the same branch - maybe undoing the merge will unconfuse bzr [00:50] Manfre: http://bugs.launchpad.net/bzr/+bug/235407 [00:50] Launchpad bug 235407 in bzr "'pop(): dictionary is empty' in tsort when showing pending merges" [High,Fix released] [00:50] jelmer: Good for you guys I didn't try to use nautilus-bzr yet. ;) [00:50] (-: [00:51] jelmer: I started on a pure PyGTK version of the olive gui.. I hope that sounds interesting? [00:51] colbrac, what do you mean by that exactly? [00:52] a OliveGui class that builds the main window instead of the glade one [00:52] thanks Odd_bloke [00:52] so self.vbox.add(menubar) etc [00:52] :P [00:52] Manfre: No problem. [00:52] colbrac: Ahh, yeah, that is certainly interesting [00:53] lp:~colbrac/bzr-gtk/noglade [00:53] still very rough of course etc etc [00:53] colbrac: Submitting that in small (but still usable) portions will probably help it being merged quickly, rather than a single big patch [00:53] well.. [00:54] I can make it such that it can be a drop in replacement of the glade one [00:54] I think at least :P [00:54] If my viz changes are accepted, that scratches most of my bzr gui itches. :) [00:55] ToyKeeper: Did you play around with the diff positioning? [00:55] The unsorted bookmarks were a big itch for me personally. :) [00:55] Yeah, I haven't been able to find a layout I like better. [00:56] The main change I'd still like to see is a way to view all branches in a repo at once, using viz. [00:56] jelmer: I don't really know how a full GUI can be merged in in bits.. [00:56] colbrac, there are different windows in olive for example [00:56] oh that.. [00:56] it makes sense to convert one window at a time [00:56] I did that [00:56] and merge that separately [00:57] it's 1 big patch but with commits per dialog [00:57] I agree the main window is probably pretty hard to convert in stages [00:57] ToyKeeper: +1 on the all branches view. [00:57] most of the dialogs are done already [00:57] only that info dialog looks hard so I didn't try it yet [00:58] The olive dialogs cleanup -take3 message in the bzr-gtk list === emgent_ is now known as emgent [01:15] Odd_Bloke, still there? [01:23] jelmer: 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:42] jelmer: Yeah, though I suspect you may be gone by now. :) [01:48] jelmer: Now I'm going to bed, so it'll have to wait until the morning. [01:59] is bzr really going to be released with a repo format called [02:00] 'Bazaar development format 1 with subtree support (needs bzr.dev from before 1.6)\n' [02:00] ? === splodge is now known as cael === cael is now known as caelj === caelj is now known as splodge [03:05] mwhudson: I hope not. [03:06] abentley: good good === sm_ is now known as sm [03:29] * igc lunch === arjenAU2 is now known as arjenAU [04:42] guys, is there a program that tracks a CVS repo and imports the changes to bzr and the other way round? [04:44] cvs->bzr yes [04:44] not the other way [04:45] Going either way is probably doable. Both at the same time is another story. [04:45] mwhudson: so its not possible to commit to a bazaar branch and it replicates/pings the CVS? [04:46] You 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] Manual [04:47] AfC: hmmm not quite what i had in mind. well... np them. [07:06] * mwhudson waves https://bugs.edge.launchpad.net/bzr/+bug/248604 around [07:06] Launchpad bug 248604 in bzr "locking repository makes no difference to speed of repeated get_revision calls" [Undecided,New] [07:13] hi! 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] now... does this mean the merge directive is incomplete, corrupt? against a tree i don't have? [07:13] or a bzr bug [07:14] stewart: it means it was made against a rev you don't have - probably something in the 6.0 trunk to some such [07:15] lifeless: ahh.. okay. the error message could probably be nicer (or at least on the same screen :) [07:15] it's like 3 pages of python backtrace up [07:15] stewart: ouch; cxare to file a bug ? [07:15] can do [07:17] * stewart field bug... waits for magic irc bot to say it's done [08:45] night all [08:46] igc: night === weigon__ is now known as weigon [09:19] poolie: ping [09:34] Moin. [09:40] hello, with bzr svn, is this possible to use local svn check outs as a start ? [09:40] kiorky: yes [09:40] lifeless: do you have any clue or pointer on how to do that? [09:41] kiorky: cd to the checkout, start running bzr commands [09:41] * AfC does that rather frequently, not always wanting to import everything and therefore not needing to use bzr-svn et al [09:43] then how can i map the svn/bzr thing for commiting back to the svn repo? [09:43] when i commit on bzr [09:43] s/commit/push/ [09:44] kiorky: 'bzr checkout svn://url FOO; cd FOO; bzr merge BZRBRANCH; bzr commit' [09:44] kiorky: (you need a bzr native tree to do merges in (as far as I know, jelmer may know more) [09:46] lifeless: 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 allready [09:47] kiorky: 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 data [09:49] lifeless: so the only way to go is to co again? [09:49] kiorky: yes. but once you have done that you can branch locally from it and it won't have to fetch it over the network again [09:57] ubottu: paste [09:57] pastebin 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:58] Odd_Bloke: ? [10:04] lifeless: I was going to paste something, then changed my mind. :) [10:05] Odd_Bloke: :) [10:07] 'morning [10:08] jelmer: can you bzr merge in a svn co? [10:09] lifeless, no, since there [10:09] *since it's not possible for merge to pull revisions into the local repository [10:10] Odd_Bloke, still there? [10:10] jelmer: righto [10:11] jelmer: could create a pending-merge micro-repo :) [10:12] lifeless, yes, but that requires me to detect how the repo is being used [10:12] jelmer: Yup. [10:12] jelmer: I mean in e.g. .svn/pending-merges-repo [10:40] lifeless: did you see bug 248506? [10:40] Launchpad bug 248506 in bzr "stacked fetch fails to copy required revisions" [Critical,Confirmed] https://launchpad.net/bugs/248506 [10:41] abentley: no I hadn't [10:42] I tried to figure out the exact issue, but I got a little lost. Can Packer use a fallback repository? [10:43] jelmer: uhm i get problems [10:43] jelmer: ImportError: cannot import name make_file_factory [10:43] jelmer: with svn 1.5, and its binding, bzr1.6 or 1.5 and the stable branch [10:43] abentley: no, what I was thinking was to use the generic VF implementation when pulling into a stacked environment; it should perform m~= these days [10:44] jelmer: (when doing bzr svn-import URI) [10:44] lifeless: The current implementation is using Packer for fetch, so that appears to be why it's failing. [10:45] jelmer: http://www.friendpaste.com/SLCdppAS [10:51] abentley: I suggest doing a check that neither source nor target have fallback repos in the interpackrepo thing [10:53] lifeless: do you have any idea on my import problem? ABI changed ? [10:54] kiorky: svn wbzr-svn head needs bzr.dev head [10:54] lifeless: Ha ok :) [10:56] lifeless: there is no way to have svn integration with stable releases ? (even with previous version or bzr svn) [11:03] kiorky: yes, but you can't use the head of the branch, you need some commits back; jelmer: ^^ [11:03] kiorky: (I really want bzr-svn in the ppa to address this, its being discussed on list at the moment) [11:06] lifeless: another thing im now using bzr head [11:06] lifeless: but now i cant authenticate with the svn repo [11:06] it just fails :p [11:06] kiorky: if you are using bzr head, then bzr-svn head should work - but you'll need to run make in the bzr-svn dir [11:06] lifeless: i mean there is maybe some configuration spoemwhere to get the crendentials info? [11:06] lifeless: yep, that what i had done [11:07] now, on import, i cant authenticate :) [11:23] lifeless: jelmer uhm, i dont suceed in making bzr svn-import run [11:24] either i get authenticate problems, or when i put the creds in the url i get : "RROR: Not a branch:" [11:25] even on non auth'd enabled servers === abentley1 is now known as abentley [11:25] (i tried to co the svn repo) [11:35] kiorky: hi, have you checked the FAQ? [13:10] hey - I've a project - and I deleted a file about 100revs ago. [13:10] Is there a way to get it back, w/o having to scan through history manually looking for the revision where I deleted it? [13:11] Maybe bzr log path/to/file will find you the commit where you removed it? [13:12] nope [13:12] Necoro, "bzr revert file" might work [13:12] not 100% sure tho [13:13] pygi: bzr: ERROR: Path(s) are not versioned =/ [13:14] eh, yes, that's only for non-commited stuff [13:14] * pygi thinks [13:15] hmm ... ok ... "bzr diff -r1.." at least gives me the date where I deleted it =) [13:17] hmm ... no [13:17] Necoro, bzr revert -r123 some_file should actually do the trick [13:17] You need to "revert -r" to bring it back. [13:17] as long as you know the revision [13:17] but I do not know the revision ;) - that's the problem [13:17] But there's no way to find the rev other than "log -v | less ; [13:17] I just could use "-r1" but don't know I changed something in between -r1 and -r$deleted [13:18] bzr log should be ablt to take a file id [13:22] Necoro: You could use the bisect plugin. [13:23] Necoro: bzr revert -r -100 FOO [13:23] Necoro: or bzr log -v | less, then /filename [13:26] lifeless: the latter one works :) - though it isn't as automagic as I thought ;) [13:27] Necoro: If you branch http://bzr.daniel-watkins.co.uk/bisect/automated/ into ~/.plugins/bisect and then do 'bzr bisect run stat '. [13:30] Odd_Bloke: can't branch from inside the company (damn proxy/firewall -.-) ... is there a difference to the lp:bzr-bisect ? [13:38] Necoro: Yeah, there is. Would it help if I pushed it to LP? [13:39] yes - 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:40] Necoro: https://code.launchpad.net/~daniel-thewatkins/bzr-bisect/automated [13:41] Yegods, my sysadmins are morons. [13:41] "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:42] "I'm sorry, we can't do that for security reasons"£ [13:42] * awilkins slaps forehead [13:43] <_paneb> is there a way to see the parent of a branch? [13:43] <_paneb> (i am about to do bzr merge) [13:44] Odd_Bloke: thanks - branching worked ;) - but running the command yields: http://rafb.net/p/ZDDJkI98.html [13:45] or do I have to do certain things before I'm able to run it? [13:45] _paneb: bzr info? [13:45] <_paneb> ok [13:47] and btw: bzr bisect deletes uncommitted changes w/o notice ;) [13:50] Necoro: That's a bug ; needs reporting [13:53] Necoro: Apologies, I didn't realise. [13:54] Odd_Bloke: no problem - nothing lost which can't be reproduced using zsh history ^^ [13:54] And I probably meant 'bzr bisect run "stat Necoro: ^ [13:56] Odd_Bloke: http://rafb.net/p/Q9POdw13.html ... still not works [13:56] oh - wrong paste [13:57] that's the one -> http://rafb.net/p/MrtUS580.html [13:59] Necoro: OK, you actually want the opposite of what stat does. I'm not sure of the best way to do that. [14:01] Necoro: Try 'bzr bisect run "test ! -e "'. [14:02] Odd_Bloke: wohoo :) works [14:03] \o/ [14:03] thanks a lot :) [14:03] Necoro: No worries. It's nice to finally have a real-life use case for that stuff. :) [14:04] hehe =D [14:07] do you think it is possible to put this in one command? - so like: bzr undelete ? [14:13] Necoro: 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:15] Necoro: I think we should make getting at the file more easy [14:15] Necoro: 'bzr revert -r xxx foo' *is* undelete already [14:16] Necoro: so, I think a mode to revert to search for a file, or some means to search for it would bbe sufficient [14:20] * pygi thinks that might be god way to contribute something :) [14:23] * fullermd imagines "bzr path-history "... [14:36] fullermd: bzr search path === mw|out is now known as mw [14:54] lifeless: that's true -- but plugins aren't able to overload existing commands, are they? [15:02] Necoro: they are [15:02] ok :) [15:02] Necoro: but that can be problematic if you have more than one plugin trying to override the default [15:09] I think some of the builtins could stand being refactored into multiple routines that you could overload in plugins [15:10] Or even provide extension points for them [15:18] awilkins: indeed [15:23] Getting information for AnnotateUI: 118.64552807807922 secs :D [15:24] Hmm, how do you do a graceful shutdown of Loggerhead? [15:24] I managed to shut it down in the middle of a request. [15:27] Peng: no idea sorry === thekorn_ is now known as thekorn [15:30] Can bzr+http:// do certificate authentication? [15:31] My question is probably more of a Paste question anyway. [15:31] awilkins: vila: knows [15:31] vila: do we have docs for easy answers on this [15:32] I 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] Hmm. bzr just ate ALL my RAM [15:32] almost all 1280 MB of it [15:32] I should learn to open my beak less on the "security" issue [15:32] no, but hopefully I will address that soon (when I get back from vacations in 3 1/2 weeks :) [15:32] vila: Can it do digest? [15:32] Is Python's SSL support smart enough to do that? [15:32] awilkins: if you use the pycurl http implementation it will verify certificates [15:33] vila: Server, yes, client also? [15:33] awilkins: digest is supported [15:34] awilkins: 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] Ok then, guess I'm going with digest for the time being :-) [15:35] jelmer: bzr-svn eats all my memory [15:35] uws: What version? [15:35] jelmer: Can I convert a large SVN repo to bzr+svn stuff in chunks? [15:36] uws: Yes. I always do that. [15:36] 0.4.10 [15:36] uws: Yes, I wrote a script to do it 1000 revs at a time [15:36] I had to hard-reset my machine [15:36] Is there a way I can "continue" the previous branching/ [15:37] I'm using a repos --rich-root-pack and branched http://...../trunk into "project.trunk" [15:37] uws: cd project.trunk ; bzr pull http://.....trunk [15:38] webkit is quite a large project ;) [15:39] uws: The next version of bzr-svn (possibly paired with svn 1.5) will leak a lot less. [15:39] I already run svn 1.5.0 [15:39] uws : https://launchpad.net/projects/?text=webkit [15:42] awilkins: Hmmm. How can i branch that? [15:43] awilkins: bzr branch lp:~vcs-imports/webkit-open-source/trunk doesn't work [15:44] awilkins: ah, it's not imported it seems https://code.launchpad.net/webkit-open-source [15:45] Ah well, it was a good try :-)_ [15:45] so where's that rev pulling thingy? [15:46] uws: 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:57] awilkins: 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; done === davi__ is now known as da === da is now known as davi [16:23] jelmer: When are you going to be arriving on Wednesday? [18:43] hey 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:46] andresj: I know this isn't the greatest answer, but you could branch the latest versions from launchpad and use bzr.dev. [18:47] ToyKeeper: I don't really know what you mean. :P [18:48] Basically, 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:49] ToyKeeper: oh well I guess I could do that... but is there really no bzr-svn package available? [18:50] There may be a newer one in debian/testing or debian/unstable, and possibly in a PPA. [18:52] I 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:53] oh haha ok :) no i dont develop bzr :P well I guess i'll keep looking or if not install from source. thanks ToyKeeper :) [18:56] andresj: If you decide to go that way, the "Run from source directory" section here may help: http://bazaar-vcs.org/InstallationFaq [18:56] ToyKeeper: allright thanks I'll check it out :) [18:56] You 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] andresj: we're working on the PPA; the list has the current status [18:58] lifeless: oh cool where is the list? :) [18:59] ToyKeeper: oh wow thats cool this is one of the few programs that can do that in my expierence :D [19:02] In some cases, running "make" is also required. (including bzr-svn) And you'll of course need to provide any dependencies. [19:02] of course :) === mw is now known as mw|food [19:41] i 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] i 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] lakshmanan, have you done: bzr launchpad-login your_username? === \sh is now known as LeonovShuttle [19:43] but the error messge is somthing different... [19:43] lakshmanan, yes, that error message is because you're trying to push through http [19:43] ok.. so what should i do [19:43] you're probablt using lp:location [19:43] lakshmanan, what's your username in Launchpad? [19:44] i enter an email id to login my account === LeonovShuttle is now known as \sh [19:44] lakshmanan, right, but you should also have a username [19:45] there 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) -> lak89 [19:46] lakshmanan, is this you? https://launchpad.net/~lak89 [19:46] yes [19:46] if it is, then, run: bzr launchpad-login lak89 [19:47] what exact command are you using to push? [19:48] i use bzr push [19:48] is the important part you should paste :) [19:50] beuno, i ran bzr launchpad-login lak89.... it didn't say anythng... my prompt came back [19:51] beuno, i did paste the branch location correctly [19:51] lakshmanan, ok, try pushing now [19:52] beuno, 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] " [19:53] lakshmanan, say yes :) [19:54] beuno, 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] .............this is what it is saying [19:55] lakshmanan, right, do: bzr push lp:~lak89/getedit/mine --use-existing-dir [19:55] this won't happen from now on, because you've specified your launchpad ID [19:56] beuno, what is the correct way of pushn to a branch.. is this so tedious like this everytime [19:56] lakshmanan, no, again, this happened now because you didn't have your launchpad ID set [19:56] from now on, it's just: bzr push [location] [19:57] beuno, 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:58] lakshmanan, this is system-wide [19:58] so it will just be push [19:58] this is a one time thing you have to do [19:58] to use lp:location URLs [19:59] having your username set, it uses ssh instead of http, so it can perform write operations [20:00] beuno, 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 on [20:01] lakshmanan, from now on, just use: bzr push location [20:01] beuno, ok... but everytime.. i restart... should i set this username thing [20:02] you 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 flag [20:02] lakshmanan, you will have to specify that again if you reinstall, or use it from a different user on the system [20:02] ok [20:03] brb.. thanks [20:03] welcome' [20:06] lifeless: that compression stuff looks very interesting === mw|food is now known as mw [20:19] Kinnison: :) [20:19] Kinnison: play! [20:22] Is it just me, or is the lp branch "pybloom", not "bzr-pybloom"? [20:23] lifeless: tempting, but I'm busy writing READMEs and tests for my templating library [20:23] what's the current state of bzr-svn? anybody know if bzr-svn 0.4.10 has problems with svn 1.5? [20:25] looks like current bzr-svn requires current bzr as well [20:26] Uh, there's an svn 1.5 compatibility branch. [20:26] I don't know much else though. [20:26] And yes, bzr-svn's 0.4 branch requires bzr.dev. [20:27] dash: are you usign bzr-svn from source? [20:28] Verterok: was trying to :) [20:28] in that case I think you need install the subversion-dev package from your distro [20:28] yep, got that [20:28] getting an error from libsvn though [20:28] dash: bzr-svn now provide it's own python bindings to subversion [20:29] so you need to compile them against your installed subversion [20:30] Verterok: even 0.4.10? [20:30] dash: I don't know, let me check [20:30] because i'm not seeing any C files in there [20:31] specifically, attempting to branch from an svn url gets me this: [20:31] python: /build/buildd/subversion-1.5.0dfsg1/subversion/libsvn_ra/ra_loader.c:973: svn_ra_get_log: `Assertion *path != '/'' failed. [20:32] dash: I encountered a similar error while trying to build it for Mac OS X [20:33] dash: are you building subversion-1.5 from sources? [20:33] no [20:34] using the package in intrepid [20:34] dash: I think that error is caused by a minor version number in the subverison build [20:35] yeah apparently the api changed in 1.5 [20:35] guess i'll downgrade [20:36] dash: bzr-svn branch (0.4) contains the c files [20:36] dash: https://code.launchpad.net/~jelmer/bzr-svn/0.4 [20:37] yeah I just tried that [20:37] it doesn't work with bzr 1.5 though :) [20:42] dash: time to fill a bug them :) [20:43] Verterok: why's that? Peng just said it depends on bzr.dev [20:45] oh, sorry I missed that [20:46] dash: I assumed svn-1.5 :P [20:46] Well, I mean, I don't know if it's intentional, but it's the case at the moment. [20:48] bzr 1.6 will be along soon enough [20:48] I can deal with bzr-svn 0.4.10 until then. :) [21:19] hm. 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:35] Hi, are there any good instructions out there for building debian/ubuntu packages for bzr plugins? [22:03] so folks, welome cheezeburger :) [22:04] a bzr repositories serving tool :) [22:05] * pickscrape pricks his ears up [22:05] Read-only serving or read/write? [22:05] Does making bzr checkout downloads full diff history ? [22:06] matkor: yes. "bzr checkout --lightweight" does not. [22:08] ok.. 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] matkor: 1.6 is going to allow something like that, I believe [22:08] 'stacked branches' [22:14] pickscrape, read-write [22:14] pickscrape, it allows easily setting up bzr repositories and access management to them [22:14] pygi: does it use the smart server? [22:14] probably yes, still gotta see =) [22:15] it's just an idea I got today, and registered a project [22:15] pygi: Then it sounds very interesting indeed. [22:16] pygi: I'll watch your project with great interest :) [22:16] :) [22:18] Sorry to ask again, but can someone point me at some docs on packaging bzr plugins for debian/ubuntu? [22:18] hmmm [22:19] here's an idea [22:19] apt-get source bla-package [22:19] where bla-package is some bzr plugin, and you can see how it's done [22:19] then if you have any questions, I can probably help [22:19] pygi: where is the code for cheeseburger ? [22:19] :D [22:20] asabil, cheezeburger* :) [22:20] asabil, in my head, does that work for you? xD [22:20] lol [22:20] I'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] sorry, cheezeburger [22:20] pickscrape, debian directory [22:20] pickscrape: it wouldn't be in the checkout, i bet [22:20] heya. 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 time [22:21] Yeah, there isn't a debian directory here [22:21] pygi: looking forward to see the real thing [22:21] pickscrape: that stuff is usually kept as a patch [22:21] asabil, :) [22:21] pickscrape: apt-get source will fetch it [22:21] dash: thanks, I'll try that out [22:21] chx: if you're just versioning a single blob, maybe xdelta or git would serve you better [22:21] chx, ehm, that's not so nice, but ... [22:21] not a blob. text file. [22:21] i have a LOT of data. [22:22] and then some. [22:22] a blob actually is any file :P [22:22] okay, okay [22:22] chx: question is, what operations do you want to perform [22:22] in databases blob is a binary large object ;) [22:22] dash: commit [22:22] chx: is that all? :) [22:22] dash: when the database server dies under every other blue moon , checkout. [22:22] dash: thanks, that has revealed it :) [22:22] chx: i'd just keep a list of diffs [22:22] asabil, do you have a use case? :) [22:22] dash: yes. that's all. and, sometimes it'd be great to throw out old stuff. [22:23] chx: yep. you want a backup system, not an RCS :) [22:23] well, no [22:23] pygi: it's about hosting/managing/serving bzr branches right ? [22:23] An RCS sounds to me like the ideal stuff for this [22:23] asabil, yup [22:23] after all [22:23] i have a file that grows. [22:23] and, if we have the dump in an RCS who knows what useful things we can do? [22:23] tag it before a big rollout? [22:23] chx: RCSes have to support a lot more operations [22:23] why not. [22:24] chx: like, not forgetting history :) [22:24] dash: I ... know. [22:24] pygi: something like launchpad's bzr support would be just awesome [22:24] dash: i know. [22:24] dash: i was wondering whether graft would be useable here.. just wondering. [22:24] asabil, it's not any kind of UI, rather just a server side tool [22:24] you got that part, right? :) [22:25] pygi: I would want both :p [22:25] pygi: so in a very loose sense, it's like a bzr equivalent of svnserve? [22:25] asabil, I agree, but for UI stuff I need help :P [22:25] pickscrape, ehm, it's something similar to gitosis if you're familiar with it? [22:25] =_= [22:26] pygi: I'm not actually. Gave up on git when my head started to melt, came here and haven't really looked back [22:26] I'll read up on it though [22:26] pickscrape, lemme get a link for you [22:26] http://scie.nti.st/2007/11/14/hosting-git-repositories-the-easy-and-secure-way [22:26] dash: xdelta...? [22:27] asabil, if you wanna help tho ... :) [22:28] pygi: just design it so that a UI can be added on top [22:28] pygi: I am afraid am really not skilled with UIs [22:28] chx: never mind, thought it was a binary [22:28] no, no [22:28] just a "small" textfiel [22:29] that gives me a ton of headaches [22:29] asabil, ofcourse, didn't thought of doing it any other way :) === BasicPRO is now known as BasicOSX [22:34] * pygi goes back to writing some git stuff [22:44] I'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:45] well, 'the tests always pass on trunk' [22:46] so if you're seeing failing tests, it's very very likely you introduced them [22:46] but i guess running in a pristine bzr.dev branch first would be good to confirm this [22:46] * luks would change that to 'the tests usually pass on ubuntu/linux machines' [22:47] (with en_* locale) [22:49] well, yes === herb__ is now known as herb [22:56] pygi: What do you envisage cheezeburger doing? And shouldn't it be 'cheezburger'? [22:58] anybody 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:59] or is this something missing in pygtk? [23:01] colbrac: http://www.pygtk.org/docs/pygtk/class-gtkwindow.html#method-gtkwindow--set-icon-list ? [23:03] Odd_Bloke, possible, yes, I messed it up :P [23:04] luks: and --no-plugins [23:04] luks: thanks, I've been looking all over that page but this seems worth a try [23:05] Odd_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 stuff [23:08] woohoo! That worked :) Olive now has an icon in the switcher :D [23:10] pygi: Do you mean repos or branches? [23:11] Odd_Bloke, ehm, well, branches [23:14] anyone have thoughts on https://bugs.launchpad.net/bzr-svn/+bug/248289 ? [23:14] Launchpad bug 248289 in bzr-svn "concurrent access problems" [Undecided,New] [23:15] jelmer: ^ [23:52] igc [23:52] morning