[07:40] <gour> morning
[07:43] <gour> i need one advice...pulled one git(hub) repo using bzr-git, did some small contribution (bzr completion for fish shell), pushed to my github account, created pull request and the 'patch' was applied by git-rebase to upstream. however, attempt to bring the updated branch back to bzr using bzr-git creates many conflicts and/or creates man new files...probably due to rebase but i'm not familiar with it nor i have
[07:43] <gour> intention to use it not really seeing use for it. now i'd like to work further on the project and contribute more, but i wonder what would be the most painless way to do it without using rebase in bzr(-git)?
[07:44] <gour> i also believe that using hg-git won't make the problem easier to me:..
[08:19] <jelmer> hi gour
[08:20] <jelmer> gour: how did you push to your github account?
[08:21] <jelmer> go	dpush indeed creadoes an implicit rebase
[08:21] <jelmer> arghm lag
[08:21] <jelmer> gour: dpush indeed does an implicit rebase
[09:13] <gour> jelmer: dpush
[09:13] <gour> but the maintainer seemingly used rebase to apply all the different contributions
[09:49] <jelmer> gour: that would lead to issues in git as well
[09:49] <jelmer> gour: although perhaps not content conflicts
[10:06] <gour> jelmer: maybe i should just do contribution in my bzr-git branch and then prepare patch for applying to avoid those conflicts
[10:37] <jelmer> gour: I would just "bzr pull --overwrite" after the changes have been merged upstream
[10:38] <gour> jelmer: thanks...let me try that
[11:30] <gour> jelmer: that worked ok and, imho, better than my attempts with hg
[12:09] <jelmer> cool
[13:55] <awilkins> lifeless, ping?
[14:26] <gour> is 2.6. development going according to the schedule?
[15:03] <jelmer> gour: sure, I guess?
[15:03] <jelmer> schedule?
[15:34] <gour> jelmer: well, release in august?
[16:28] <gour> i just saw a thesis from jun 2010 entitled 'Analysis and Comparison of Distributed
[16:28] <gour> Version Control Systems?
[16:28] <gour> bzr looks quite good in some aspects, but wonder what has changed in between?
[16:30] <gour> here is the link http://thehappy.de/~neo/dvcs.pdf
[16:51] <vila> Branches in Bazaar are created by cloning a repository (a repository is
[16:51] <vila> called branch in Bazaar); each Bazaar repository may only have one branch
[16:51] <vila> head.
[16:51] <vila> As a workaround Bazaar provides shared repositories
[16:52] <vila> eeeerk, wtf ? *Every* bazaar repository can have as many branch heads as you desire
[16:56] <gour> heh...it's not only phd thesis :-)
[16:56] <gour> s/it's not/it's
[16:57] <gour> ahh
[16:57] <gour> s/not only/not
[17:07] <vila> quite good from what I read so far, will print for bed :)
[17:11] <gour> :-)
[17:19] <Wiz_KeeD> hey guys
[18:19] <lifeless> awilkins: pong
[18:19] <awilkins> Since you wrote the page mentioned here ... : http://askubuntu.com/questions/151387/confirming-pgp-key-on-launchpad/151458#151458
[18:20] <lifeless> I did ?
[18:20] <awilkins> It says "lifeless"
[18:20]  * awilkins waits for it to load
[18:21] <lifeless> hah
[18:21] <lifeless> no, it says 'last edited by'
[18:21] <awilkins> Aha .. close enough?
[18:21] <lifeless> it was created by matthew revell
[18:21] <lifeless> https://help.launchpad.net/YourAccount/ImportingYourPGPKey?action=info
[18:21] <lifeless> and edited by many others
[18:22] <lifeless> anyhow, you have my attention :) - whats up ?
[18:22] <awilkins> Ah well.... I guess since I knew you from here it lit a bulb
[18:22] <awilkins> Just a possible improvement in explaining that gpg expects an EOF
[18:23] <awilkins> I would have done it but I don't seem to have any ability to edit those pages
[18:23] <lifeless> thats locked down to an explicit group, if you want to help maintain the docs I can add you in/
[18:23] <lifeless> Step 6 in importing your key is the relevant
[18:24] <lifeless> one - the confused person seems to have taken the encrypted email *out* of their email client.
[18:24] <awilkins> I'm not sure whether he got relief from the EOF or from installing Enigmail
[18:24] <Noldorin> hey folks
[18:25] <awilkins> Enigmail doesn't come by default though
[18:27] <awilkins> I don't mind being added to that group, I guess .. I think I can be trusted not to deface things :P
[18:27] <lifeless> I've posted a question for him on that.
[18:28] <lifeless> awilkins: whats your LP id ?
[18:28] <lifeless> Noldorin: hi
[18:28] <Noldorin> how's it going, lifeless ?
[18:28] <awilkins> lpid == adrian-wilkins
[18:28] <Noldorin> any exciting bzr/launchpad news?
[18:29] <lifeless> Noldorin: we're hoping to make ppa's massively better in the next 2 months, I'm pretty excited by that
[18:30] <Noldorin> lifeless: cool. i'm not using Ubuntu presently, but that would encourage a growth in packages i suppose :)
[18:31] <lifeless> other way around; growth in packages and popularity means we're getting overwhelmed, have to make it better to cope ;)
[18:31] <Noldorin> lifeless: hah i see.
[18:31] <Noldorin> so what are these changes basically?
[18:31] <Noldorin> improvements...
[18:31] <lifeless> https://dev.launchpad.net/DisklessArchives
[18:31] <lifeless> is the design side of it
[18:31] <Noldorin> bar is very stable and feature-complete these days, so i can't see much more work being done on it really...
[18:32] <lifeless> sorry, thats the technical side of it
[18:32] <lifeless> https://dev.launchpad.net/LEP/DisklessArchives is the design/high level side
[18:32] <lifeless> It would be nice to have better history editing support in bzr, I think that makes more different to folk that we realised back-when
[18:33] <Noldorin> lifeless: oh okay. so the number of packages as well as users on Ubuntu is swamping you eh? :P
[18:33] <lifeless> for stuff not in the main archive itself, yeah.
[18:33] <lifeless> the main archive gets carried by lots of mirror networks
[18:34] <Noldorin> lifeless: okay so essentially it's a problem of inefficient distribution over the PPA servers at the moment
[18:35] <Noldorin> so you're going to improve the architecture and protocol model...
[18:35] <Noldorin> to make things work smoother and cope with capacity increases better?
[18:36] <Noldorin> also, by history editing do you mean rebasing… or rather, editing old commit messages and such?
[18:39] <awilkins> Or more like git rebase =i
[18:39] <awilkins> -i
[19:05] <Noldorin> awilkins: what's that do?
[21:02] <awilkins> git rebase -i lets you pick and choose, reorder, squash, etc, your commits
[21:02]  * awilkins is answering a question from 2 hours ago #RainMan
[21:45] <lifeless> awilkins: Noldorin: editing - I mean rebase -i and similar tools; editing old commit messages either in a rebase fashion, or via something more complex, but actually supporting it would be the first thing ;)
[21:45] <lifeless> Noldorin: yes, make things smoother, more responsive, and scalable.
[21:46] <Noldorin> oh hi again lifeless
[21:46] <Noldorin> heh, delay
[21:46] <Noldorin> lifeless: so what is "rebase -i"?
[21:46] <Noldorin> i just know what rebasing does in general, pretty much
[21:49] <awilkins> It presents the commits you ask in a text file, you edit the file, it reorders then, squashes them together, ignores them, etc