[01:54] I did `bzr remove foo~' and it said it removed foo~ but kept a copy foo~.1 [01:56] removed COPYING~.~1~ (but kept a copy: COPYING~.~1~.~1~) [06:05] Do people here actually prefer Bazaar? [06:10] * fullermd_ would assume :) === fullermd_ is now known as fullermd [06:11] 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] In a world that contains VSS, I can hardly imagine making fun of bzr... [06:13] fullermd: VSS? [06:14] Oh, my. If you don't already know, don't try to find out. [06:14] You'll never sleep again. [06:16] => bzr sucks [06:16] * Peng gasps [06:16] bzr: ERROR: unknown command "sucks" [06:17] That is, if I must be scared to learn what "VSS" is. [06:19] There are many things in the world any sensible person should be scared of :p [06:19] ohh visual anything is bad [06:20] i think judging bzr by vss is a low standard tho [06:24] There're a lot of low standards available in present VCSen, to say nothing of historical :p [06:24] You can be _so_ much more pathetic than anything about bzr, and still be in like the top 10%... === FourDollars_ is now known as FourDollars === rvba` is now known as rvba [16:13] I have a conflict in code which the author has 'tidied' [16:13] (indentation changes) [16:13] that is, there is a real honest conflict, but the extent of it is considerably confused by purely formatting changes [16:13] are there any clever tricks? [16:14] I tried formatting the two branches identically and committing that before the merge [16:14] whilst that makes the diff look simpler (good) it makes the merge conflict worse :( [18:10] 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] and we'd need to have a release from the authoritative source. [18:40] vila, ^ [18:40] fmccann, vila's not around, but he might be able to do that [18:41] fmccann: hello there ! [18:41] Howdy! [18:42] fmccann: Please to meet you ;) What osx version are you using ? [18:42] I’m on OS X 10.11.13 [18:42] But I can make the Homebrew formula make easy installs for most any recent versions of OS X [18:43] fmccann: I have not the fanciest idea about Homebrew ;-) Have you looked at the lp:bzr-mac-installers project ? [18:43] https://launchpad.net/bzr-mac-installers [18:44] I haven’t looked at that - I assume that’s what creates the dmg packaged installer? [18:44] yes, is that obsolete for 10.11 ? [18:45] I think the website says the last build was for 10.7 or so [18:45] 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] yes, so if you can build one for 10.11 with qbzr only that would already be a huge step forward [18:46] I’m more than happy to throw some time at that as well [18:47] either way, would it be possible for bzr-bisect, bzr-difftools, and bzr-extmerge to have a formal release tarball? [18:47] If you have a way to install bzr on osx 10.11, there is a 2.7.0 release in the works [18:47] certainly [18:47] 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] fmccann, that is a great site, I hadn't heard of before! [18:49] fmccann: are you subscribed to the (beuno, stop stealing my words ;-) mailing list ? [18:50] I am [18:50] I did announce the site back in 2011 I think [18:50] vila, type faster! [18:50] 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] fmccann: it should be referenced on the bzr site, sorry about that oversight :-/ [18:51] fmccann: care to throw a MP at it ? [18:51] what’s the lp url for the site? [18:52] https://launchpad.net/bzr-website [18:52] No problem. I’ll get a MP in there [18:53] \o/ [18:54] fmccann: back to the ML. Would you mind replying to the freeze announcement message describing your status/progress/needs on 10.11 ? [18:54] Sure [18:54] Just for future reference, is the mailing list or the IRC channel the preferred way of harrasing people? :D [18:55] Be careful what you wish for :) [18:55] You just summoned the Daemon of The Channel ;) [18:56] fmccann: whatever works for you, IRC is higly dependent of time zones [18:56] ok. And let me appologize in advance if I get any of the launchpad ettiquite or process wrong. I mean well ;) [18:57] 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] ok [18:58] Is the mailing list the best way to reach out to them? Or filing a bug against the project? [18:58] 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] 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] fmccann: Ideally well defined bugs (scoped) are the best to track progress and organize people around tasks [19:01] 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] fmccann: i.e. where we provide installers [19:01] great [19:02] fmccann: do you have a way to test those installations /before/ we provide the tarballs there though ? [19:05] fmccann: never mind, we can iterate until the release is announced [19:05] ok [19:05] for now I made my own tarbal and built packages [19:06] which works, but it’s not good enough to go into the global package repository [19:06] 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] but that’s all OS X and homebrew specific, not the bzr code [19:07] oh, that's good enough to test the tarballs :) [19:07] fmccann: are you using lp:bzr or lp:bzr/2.7 ? [19:08] RIght now I’m sticking with 2.6 until 2.7 is baked [19:08] fmccann: 2.7.0 won't change anymore [19:09] 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] if commits have to be done on lp:bzr/2.7 , you will need them [19:09] is 2.7 officially the stable release now? [19:09] fmccann: yes, the freeze announcement is the 'go' for packagers on the formal announcement is planned for 2016-02-12 iirc [19:09] :D [19:10] fmccann: it *will* be official with whatever installers are available [19:10] Well, I’m glad I popped in today. I’ll get it working on OS X asap [19:11] 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] so we release what has been tested and we don't touch anything ;) [19:12] 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] fmccann: you get the idea ;-D