[08:42] <mgz> real morning!
[08:43] <christiank> Here too ;-)
=== mmrazik is now known as mmrazik|afk
[09:53] <leo2007> any idea how to get bzr-grep installed?
[09:54] <mgz> leo2007: two ways
[09:55] <leo2007> please
[09:56] <mgz> get bzr-grep, install as a plugin per the normal way:
[09:56] <mgz> <http://doc.bazaar.canonical.com/plugins/en/plugin-installation.html>
[09:56] <mgz> or as it's been merged into core recently, get the bzr trunk and test that :)
[09:57] <mgz> https://launchpad.net/bzr-grep has tarballs, or you can branch lp:bzr-grep
[09:58] <leo2007> is it in 2.6b2?
[09:58] <mgz> ...I think not, will check
[10:00] <mgz> nope, that was r6536, grep merged r6555
[10:00] <hikiko> hellp
[10:00] <hikiko> hello
[10:00] <hikiko> anybody available?
[10:02] <hikiko> i want to resolve a conflict from renaming files
[10:02] <hikiko> but
[10:02] <leo2007> is there a snapshot source tarball available
[10:02] <hikiko> first of all i can't see anything in the bzr status
[10:08] <mgz> leo2007: of bzr? I can generate one trivially if you want
[10:08] <leo2007> mgz: I just installed the plugin for now. will upgrade when 2.6 is released. Do you know when it is going to happen?
[10:09] <mgz> leo2007: ideally shortly, we're just lacking manpower to do it.
[10:12] <leo2007> i see
[10:12] <leo2007> I can wait ;)
[10:16] <mgz> leo2007: http://people.canonical.com/~gz/bzr-2.6.0dev3.tar.gz.sig (which isn't gziped... silly server) and without the .sig for a current tarball
[10:17] <leo2007> cheers
[10:18] <mgz> signed with my key `gpg --recv-keys 0CDBF91C`
[10:37] <leo2007> mgz: thanks, I am teaching ack.el to accept 'bzr grep' output and it is now done http://imagebin.org/230861
[10:50] <mgz> leo2007: ace!
[11:37]  * christiank is away: Lunch
=== mmrazik|afk is now known as mmrazik
[12:08]  * christiank is back (gone 00:30:56)
[12:37] <bob2> christiank, probably want to turn that off
=== yofel_ is now known as yofel
=== dpb_ is now known as Guest91546
[14:32] <christiank> bob2: thanks for the tip, should be off now. Testing...
[14:33] <christiank> bob2: nothing should have appeared, I assume.
=== jml` is now known as jml
[16:57] <delinquentme_> OMG HAI ALL! I'm needing a way to take a look at some commits ... without actually editing my local code
[16:57] <delinquentme_> or perhaps ... to pull down a few branches from trunk ... and then revert to a previous commit :D
=== deryck is now known as deryck[lunch]
[20:21] <delinquentme> how to drop back to a particular revno?
[20:23] <delinquentme> bzr revert -r 19
[20:25] <fullermd> Depends on what you mean by 'drop back'.  update may be better suited.
[20:27] <delinquentme> how about a diff between two revnos?
[20:28] <delinquentme> $ bzr diff -r revno:1:http://bazaar-vcs.org/bzr/bzr.dev/..revno:2:http://bazaar-vcs.org/bzr/bzr.dev/
[20:28] <delinquentme> this seems silly.
[20:28] <delinquentme> why do you run a diff and need to specify two files?
[20:33] <delinquentme> ok so it seems thats for two branches
[20:33] <delinquentme> how about two files?
[20:41] <delinquentme> bzr: ERROR: Path(s) are not versioned: application.html.erb
[20:41] <delinquentme> does this mean I cant diff a file?
[20:41] <delinquentme> $ bzr diff -r 155 app/views/layouts application.html.erb
[20:43] <abentley> delinquentme: It means there's no such file.  Perhaps you're not specifying a relative path?
[22:05] <delinquentme> OK so bzr branches .. DONT correspond to their own files for each branch?
[22:05] <delinquentme> Im used to git .. where everything it stored within a single directory
[22:08] <bob2> well you will need to read docs for each new tool you use, yes
[22:09] <delinquentme> bob2, this is a discussion channel no?
[22:09] <bob2> sure
[22:14] <fullermd> I'm still really not sure what you mean by branches being files...