[00:03] <lifeless> yes
[01:25] <Noldorin> lifeless, fair enough. will have a look, thanks
[01:29] <Noldorin> hey jelmer
[01:30] <Noldorin> what's up with this? http://people.samba.org/bzr/jelmer/bzr-remove-revisions/trunk/
[13:46] <Noldorin> bazaar is sort of dying, isn't it?
[13:54] <smartboyhw> Noldorin, what?
[13:54] <smartboyhw> Bazaar is still widely used by Ubuntu and other FOSS projects
[14:27] <Noldorin> smartboyhw, evidence is that it's been on the decline for a couple of years now, and development is slowing down, especially w.r.t. plugins, and people are gradually abandoning bzr everywhere
[14:27] <Noldorin> it's sad, but it seems to be the case
[14:28] <smartboyhw> Noldorin, I like Bazaar myself (it's simplier to use), but I think Canonical's efforts has switched to other aspects, so it makes sense
[14:28] <Noldorin> maybe yeah
[14:29] <Noldorin> smartboyhw, the number of canonical devs working on it has decreased dramatically it seems
[14:29] <Noldorin> and outside contributions are virtually nil now
[14:31] <smartboyhw> Noldorin, yeah
[14:31] <Noldorin> smartboyhw, personally i'm with you. bazaar's conceptua/semantic model of version control makes a lot more sense than, say, git's
[14:31] <Noldorin> but there are other tradeoffs to be make
[14:32] <Noldorin> smartboyhw, a bzr-like wrapper over git might be a nice way forward actually. even some bzr devs have suggested that in the past, i noticed, on a mailing list
[14:33] <smartboyhw> Noldorin, OK
[14:35] <fullermd> It's not dying, it's pining for the fjords.
[14:35] <Noldorin> heh
[14:36] <Noldorin> fullermd, who knew bzr was norwegian?
[14:40] <fullermd> Remarkable version control system, ain't it?  Lovely UI.
[14:51] <Noldorin> :P
[14:51] <Noldorin> speak sense, you!
[15:14] <jelmer> hi Noldorin
[15:14] <Noldorin> hiya
[16:44] <SurvivorZ> OK. I have a feature branch w/ 8 commits. All 8 commits are merged into trunk. Now I have 5 more commits, merged into trunk, that should be in the feature branch. I know I can get to b4 the merge via $ bzr branch -rREV_B4_MERGE . newDir, but then how do I cherry pick pull the 5 later changes into the new branch? Everytime I do, it includes the merged feature branch, which makes it a copy of trunk.
[17:14] <SurvivorZ> repo=".."; for rev in {21..27}; do echo -n "Rebasing -r$rev from $repo: "; msg=`bzr log --short -c$rev $repo | grep -Ev '^ *[0-9]+ [[:alpha:] ]+' | sed -e 's/^ *//g' -e 's/ *$//g' | tr -d '\n'`; echo $msg; bzr merge -c$rev $repo; bzr commit -m"$msg"; done
[17:14] <SurvivorZ> I just created that to do what i want...
[22:37] <Noldorin> jelmer, not to mind. i found your old remove-revision plugin. handy little tool, cheers!
[22:38] <jelmer> ah, cool
[22:38] <jelmer> hope it's useful to you :)
[22:38] <jelmer> it's not the most efficient way this could be done, but I guess it sort of works
[22:39] <Noldorin> jelmer, yeah, it's an infrequent operation, so as long as it works, i'm happy heh
[23:00] <Noldorin> jelmer, hmm. is it possible to have a user-local ignore file for a branch?
[23:00] <Noldorin> i.e. one that doesn't exist in the actual branch
[23:01] <jelmer> Noldorin: in short ,no. see the mailing list for details
[23:01] <Noldorin> ah
[23:03] <fullermd> Well, if there isn't one for the branch, you can.
[23:03] <fullermd> Just stick a .bzrignore in there and don't add it.
[23:03] <fullermd> (and ignore itself, so you don't accidentally do so)
[23:04] <lifeless> Noldorin: you can have a user-local global ignores file
[23:05] <Noldorin> fullermd, yeah i want them side by side, really
[23:05] <Noldorin> lifeless, that's good enough for me, i suppose, yeah :)
[23:05] <fullermd> You could hack up the filesystem so that it alternates which one shows up on any given stat()/open()   ;)
[23:07] <Noldorin> fullermd, oh oh, what a superb idea!
[23:07] <Noldorin> well worth my time, no doubt
[23:08] <Noldorin> so elegant too
[23:08]  * fullermd is full of such wisdom!
[23:08] <Noldorin> i bet
[23:13] <Noldorin> so i'm trying to update bzr remove-revisions so that it works in the latest bzr now
[23:13] <Noldorin> bzr: ERROR: exceptions.AttributeError: 'CHKInventory' object has no attribute '_byid'
[23:13] <Noldorin> any ideas how to fix this?
[23:23] <Noldorin> nvm
[23:25] <Noldorin> but now i need to figure out what's happened to repository.text_store and repository.control_store
[23:28] <fullermd> Obviously, they're closed for the weekend.
[23:39] <Noldorin> fullermd, closed permanently, i hear
[23:39] <Noldorin> fullermd, but i also hear they reopened under new names and formats. perhaps you know more about it? :P
[23:40] <fullermd> I don't.  I just dork around with the UI, I stay away from that icky "thoPyn" or whatever that's under the hood.
[23:41] <Noldorin> heh i see
[23:43] <jelmer> Noldorin: yeah, I think the plugin is specific to an older format
[23:44] <Noldorin> mm
[23:44] <Noldorin> jelmer, was hoping i could rewrite it easily… but not proving trivial
[23:44] <Noldorin> not with my knoweledge of the internals at least
[23:44] <jelmer> it should be fairly easy - basically just clone the repository revisions but exclude the ones specified
[23:53] <Noldorin> heh
[23:53] <Noldorin> that assumes i know the object model
[23:53] <Noldorin> but still
[23:53] <Noldorin> if i invest a little time, you're probably right!