=== zul___ is now known as zul === pkl_ [n=phillip@unaffiliated/pkl/x-764568] has joined #ubuntu-mobile === Seveas [n=seveas@ubuntu/member/seveas] has joined #ubuntu-mobile [01:45] !dmwaters:*! Hi all, that split was a rotation server that was taken out for maintenence. that wasn't the planned maintenence, but we know what the problem was.:) === merriam_ [n=merriam@85-211-245-180.dyn.gotadsl.co.uk] has joined #ubuntu-mobile [02:22] !dmwaters:*! One more split for that rotation server that's not in rotation right now folks === netjoined: irc.freenode.net -> kubrick.freenode.net === Seveas [n=seveas@ubuntu/member/seveas] has joined #ubuntu-mobile === netjoined: irc.freenode.net -> kubrick.freenode.net === Seveas [n=seveas@ubuntu/member/seveas] has joined #ubuntu-mobile === zul [n=chuck@CPE0006258ec6c1-CM000a73655d0e.cpe.net.cable.rogers.com] has joined #ubuntu-mobile === jsgotangco [n=jsg123@ubuntu/member/jsgotangco] has joined #ubuntu-mobile === ferulo [n=fer@a88-115-27-99.elisa-laajakaista.fi] has joined #ubuntu-mobile === asac_ [n=asac@debian/developer/asac] has joined #ubuntu-mobile === asac_ is now known as asac === lool [i=lool@debian/developer/lool] has joined #ubuntu-mobile === seb128 [n=seb128@ubuntu/member/seb128] has joined #ubuntu-mobile === mdz [n=mdz@yttrium.canonical.com] has joined #ubuntu-mobile [01:08] tko: bazaar offers us a lot over git; it's well integrated with launchpad, easier to learn and use, more robust [01:09] tko: what do you have in mind which would make git attractive? anything other than being faster? [01:10] bazaar seems much more featureful === heno [n=henrik@ubuntu/member/heno] has joined #ubuntu-mobile [01:17] mdz: git rebase is pretty handy [01:18] asac: what does that do? [01:18] reading http://www.kernel.org/pub/software/scm/git/docs/git-rebase.html, that sounds like what bzr does by default, automatically [01:19] if you have local changes and do a merge [01:19] oh, it's talking about commits, not local changes [01:19] yes ... you can rebase [01:19] its pretty handy if you have committed changes that are not yet ready for upstream inclusion [01:20] e.g. if you upstream branch moves ahead you end up with with distinct patches for your features [01:20] you can probably do it with bzr as well ... but there is not a single command that does that for you imo. [01:21] right [01:21] e.g. for me its pretty nice to keep clean patches against mozilla code base [01:21] I'm not aware of one, though it's something which could be done easily as a plugin [01:22] nice thing is that a rebase detects if you already cherry-picked some commit from parent branch [01:23] asac: you import mozilla into git? [01:23] somehow :) ... i import new upstream releases manually (e.g. checkins are not preserved) [01:23] what happens if you rebase, and then someone who has merged from your branch tries to merge again? [01:24] but your commits have disappeared [01:24] you should not rebase on published branches [01:24] :-) [01:24] all branches should be published [01:24] I think the bazaar answer to the general use case is looms [01:25] that will give you a similar result but in a clean and mergeable way [01:25] mdz: I suppose you saw keithp's post on the robustness of the storage? [01:25] lool: no [01:25] url? [01:26] I think it's http://keithp.com/blog/Repository_Formats_Matter.html [01:26] mdz: i will look at looms :) [01:33] lool: I don't know enough about bzr's storage model to know how it compares on those specific points [01:34] mdz: i really like bzr ... i am just unhappy that we didn't get the mozilla deal :( [01:38] (Mithrandir/#ubuntu-mobile) we have the offline repo access, the private branches and the distributed backups just fine, but we rewrite the object files, and don't really do compression [01:38] (Mithrandir/#ubuntu-mobile) and we're much slower than git. [01:39] yes, I think every distributed VCS has those three principal advantages [01:39] I don't think we rewrite files, though we do append [01:40] Mithrandir: I'm pretty sure knits incorporate delta compression of some sort [01:41] (Mithrandir/#ubuntu-mobile) ok [01:41] I admit I like the idea of git's batch compression, since it maps well to usage (the bulk of history is old and already compressed, new stuff can be packed up later) [01:41] it probably works well for small files [01:43] http://bazaar-vcs.org/HistoryHorizon is more interesting I think [01:43] it doesn't matter if the history is huge if you only get what you need === irotas [n=irotas@c-66-30-195-112.hsd1.ma.comcast.net] has joined #ubuntu-mobile === agoliveira [n=adilson@201.47.76.202.adsl.gvt.net.br] has joined #ubuntu-mobile === jsgotangco [n=jsg123@ubuntu/member/jsgotangco] has joined #ubuntu-mobile [02:24] agoliveira, mdz you lost me :) [02:27] ferulo: Hi Fernando. Lost you for what? [02:27] conferences :) [02:28] Ah... === jsgotangco_ [n=jsg123@121.97.244.247] has joined #ubuntu-mobile === jsgotangco_ is now known as jsgotangco === tuhl [n=tuhl@dslb-084-057-051-106.pools.arcor-ip.net] has joined #ubuntu-mobile === jsgotangco [n=jsg123@ubuntu/member/jsgotangco] has joined #ubuntu-mobile === ferulo [n=fherrera@a88-115-27-99.elisa-laajakaista.fi] has joined #ubuntu-mobile === tuhl [n=tuhl@dslb-084-057-051-106.pools.arcor-ip.net] has left #ubuntu-mobile [] [04:18] !christel:*! Hi all. The PDPC Board and freenode staff wish to make it clear that Andrew Kirch, aka trelane, does not in any capacity speak for or represent freenode, the PDPC board, or any member thereof. Please disregard any rumours to the omtrary. Formal statement to follow on our website. [04:20] !christel:*! oops. ssh lag got the better of me, omtrary is of course, christelsk for contrary! Sorry for the disturbance and have a great day. === agoliveira is now known as adilson-lunch === mdz [n=mdz@yttrium.canonical.com] has joined #ubuntu-mobile === adilson-lunch is now known as adilson === Seveas [n=seveas@ubuntu/member/seveas] has joined #ubuntu-mobile [05:54] (tko/#ubuntu-mobile) mdz: speed is pretty much the immediately most obvious thing [05:56] (tko/#ubuntu-mobile) mdz: granted I've been mostly using git-svn but there's just something that makes it feel better once you get over the learning curve === mdz [n=mdz@yttrium.canonical.com] has joined #ubuntu-mobile [06:54] (tko/#ubuntu-mobile) I think my feeling about bzr vs. git is about perception mostly. I gather they're mostly comparable in terms of features, but git is faster and it's used by kernel, X and cairo. other than launchpad I can't name a single project that would have picked bzr [07:48] tko: telepathy stuff [07:49] well, they mix darcs and bzr IIRC [08:14] I finished entering all the basic hildon components (from Tommi's list) into launchpad. I'll now go over the python bindings which I believe we are going to need anyway. === doko [n=doko@dslb-088-073-100-164.pools.arcor-ip.net] has joined #ubuntu-mobile === mdz [n=mdz@ip-81-1-103-136.cust.homechoice.net] has joined #ubuntu-mobile === iwj [n=ian@xenophobe.extern.relativity.greenend.org.uk] has joined #ubuntu-mobile === irotas [n=irotas@c-66-30-195-112.hsd1.ma.comcast.net] has joined #ubuntu-mobile