[01:54] <calher> I did `bzr remove foo~' and it said it removed foo~ but kept a copy foo~.1
[01:56] <calher> removed COPYING~.~1~ (but kept a copy: COPYING~.~1~.~1~)
[06:05] <calher> Do people here actually prefer Bazaar?
[06:10]  * fullermd_ would assume   :)
[06:11] <calher> fullermd: Cool!  I know it's not too popular and people make fun of it, but I like Bazaar for my personal revisioning.
[06:12] <fullermd> In a world that contains VSS, I can hardly imagine making fun of bzr...
[06:13] <calher> fullermd: VSS?
[06:14] <fullermd> Oh, my.  If you don't already know, don't try to find out.
[06:14] <fullermd> You'll never sleep again.
[06:16] <calher> => bzr sucks
[06:16]  * Peng gasps
[06:16] <fullermd> bzr: ERROR: unknown command "sucks"
[06:17] <calher> That is, if I must be scared to learn what "VSS" is.
[06:19] <fullermd> There are many things in the world any sensible person should be scared of   :p
[06:19] <calher> ohh visual anything is bad
[06:20] <calher> i think judging bzr by vss is a low standard tho
[06:24] <fullermd> There're a lot of low standards available in present VCSen, to say nothing of historical   :p
[06:24] <fullermd> You can be _so_ much more pathetic than anything about bzr, and still be in like the top 10%...
[16:13] <quicksilver> I have a conflict in code which the author has 'tidied'
[16:13] <quicksilver> (indentation changes)
[16:13] <quicksilver> that is, there is a real honest conflict, but the extent of it is considerably confused by purely formatting changes
[16:13] <quicksilver> are there any clever tricks?
[16:14] <quicksilver> I tried formatting the two branches identically and committing that before the merge
[16:14] <quicksilver> whilst that makes the diff look simpler (good) it makes the merge conflict worse :(
[18:10] <fmccann> Hey bzr folks. I’ve been working on packaging some bzr plugins as Homebrew formulas to make installation on OS X much easier. I’ve got bzrtools, qbzr, and bzr-explorer working pretty well. I'm trying to get bzr-bisect, bzr-difftools, and bzr-extmerge set up, but they have no release tarballs in launchpad. Would it be possible to have an official tarball made for these projects? I can't pull direclty from version control in a Homebrew for
[18:10] <fmccann> and we'd need to have a release from the authoritative source.
[18:40] <beuno> vila, ^
[18:40] <beuno> fmccann, vila's not around, but he might be able to do that
[18:41] <vila> fmccann: hello there !
[18:41] <fmccann> Howdy!
[18:42] <vila> fmccann: Please to meet you ;) What osx version are you using ?
[18:42] <fmccann> I’m on OS X 10.11.13
[18:42] <fmccann> But I can make the Homebrew formula make easy installs for most any recent versions of OS X
[18:43] <vila> fmccann: I have not the fanciest idea about Homebrew ;-) Have you looked at the lp:bzr-mac-installers project ?
[18:43] <vila> https://launchpad.net/bzr-mac-installers
[18:44] <fmccann> I haven’t looked at that - I assume that’s what creates the dmg packaged installer?
[18:44] <vila> yes, is that obsolete for 10.11 ?
[18:45] <fmccann> I think the website says the last build was for 10.7 or so
[18:45] <fmccann> I’m trying to get packages into OS X’s most popular package manager - I think this is how people are keeping bzr up to date on OS X these days
[18:46] <vila> yes, so if you can build one for 10.11 with qbzr only that would already be a huge step forward
[18:46] <fmccann> I’m more than happy to throw some time at that as well
[18:47] <fmccann> either way, would it be possible for bzr-bisect, bzr-difftools, and bzr-extmerge to have a formal release tarball?
[18:47] <vila> If you have a way to install bzr on osx 10.11, there is a 2.7.0 release in the works
[18:47] <vila> certainly
[18:47] <fmccann> Is that on the horizon? I’m planning on updating http://bzrinit.com when that’s out
[18:48]  * vila blinks
[18:48]  * vila reads
[18:48]  * vila blinks again
[18:49] <beuno> fmccann, that is a great site, I hadn't heard of before!
[18:49] <vila> fmccann: are you subscribed to  the (beuno, stop stealing my words ;-) mailing list ?
[18:50] <fmccann> I am
[18:50] <fmccann> I did announce the site back in 2011 I think
[18:50] <beuno> vila, type faster!
[18:50] <fmccann> and while I know a bunch of languages, I haven’t bit the bullet and learned python yet, but at some point I’ll get past packages and documentation and seriosuly break trunk one day :D
[18:50] <vila> fmccann: it should be referenced on the bzr site, sorry about that oversight :-/
[18:51] <vila> fmccann: care to throw a MP at it ?
[18:51] <fmccann> what’s the lp url for the site?
[18:52] <vila> https://launchpad.net/bzr-website
[18:52] <fmccann> No problem. I’ll get a MP in there
[18:53] <vila> \o/
[18:54] <vila> fmccann: back to the ML. Would you mind replying to the freeze announcement message describing your status/progress/needs on 10.11 ?
[18:54] <fmccann> Sure
[18:54] <fmccann> Just for future reference, is the mailing list or the IRC channel the preferred way of harrasing people? :D
[18:55] <vila> Be careful what you wish for :)
[18:55] <vila> You just summoned the Daemon of The Channel ;)
[18:56] <vila> fmccann: whatever works for you, IRC is higly dependent of time zones
[18:56] <fmccann> ok. And let me appologize in advance if I get any of the launchpad ettiquite or process wrong. I mean well ;)
[18:57] <vila> fmccann: and back to the tarballs. I could create one for bzr-bisect but for bzr-difftools and bzr-extmerge, only the maintainers can
[18:57] <fmccann> ok
[18:58] <fmccann> Is the mailing list the best way to reach out to them? Or filing a bug against the project?
[18:58] <vila> fmccann: but even that is not really needed, if you say: this is version revno X 'bzr export' gives you a 100% reproducible tarball
[18:59] <fmccann> So the issue here really is the homebrew guys. They don’t have a mechanism for pulling from VCS oddly enough. They need a staged tarball from the owner of the project. I’m asking them if there’s a way around this, because I don’t see a problem with pulling from bzr directly
[18:59] <vila> fmccann: Ideally well defined bugs (scoped) are the best to track progress and organize people around tasks
[19:01] <vila> fmccann: I think we can arrange that as part of the bzr release and provide tarballs from https://launchpad.net/bzr/+milestone/2.7.0
[19:01] <vila> fmccann: i.e. where we provide installers
[19:01] <fmccann> great
[19:02] <vila> fmccann: do you have a way to test those installations /before/ we provide the tarballs there though ?
[19:05] <vila> fmccann: never mind, we can iterate until the release is announced
[19:05] <fmccann> ok
[19:05] <fmccann> for now I made my own tarbal and built packages
[19:06] <fmccann> which works, but it’s not good enough to go into the global package repository
[19:06] <fmccann> The last issue I’m working through is getting the python path playing ball on OS X for pyqt and dulwich (working on bzr-git)
[19:06] <fmccann> but that’s all OS X and homebrew specific, not the bzr code
[19:07] <vila> oh, that's good enough to test the tarballs :)
[19:07] <vila> fmccann: are you using lp:bzr or lp:bzr/2.7 ?
[19:08] <fmccann> RIght now I’m sticking with 2.6 until 2.7 is baked
[19:08] <vila> fmccann: 2.7.0 won't change anymore
[19:09] <fmccann> so 2.7 is go? I can get the packge for OS X updated and work on the OS X installer once I make sesne of that
[19:09] <vila> if commits have to be done on lp:bzr/2.7 , you will need them
[19:09] <fmccann> is 2.7 officially the stable release now?
[19:09] <vila> fmccann: yes, the freeze announcement is the 'go' for packagers on the formal announcement is planned for 2016-02-12 iirc
[19:09] <fmccann> :D
[19:10] <vila> fmccann: it *will* be official with whatever installers are available
[19:10] <fmccann> Well, I’m glad I popped in today. I’ll get it working on OS X asap
[19:11] <vila> fmccann: it would probably sound a bit abusive to call it a rolling release... But the idea is that 2.7.0 is only a new label on the most tested version of bzr since that's what is currently distributed :-}
[19:11] <vila> so we release what has been tested and we don't touch anything ;)
[19:12] <fmccann> Hey, that’s just software these days. At a minimum bumping the version will keep people from telling me no one is working on this.
[19:12] <vila> fmccann:  you get the idea ;-D