| mgz | real morning! | 08:42 |
|---|---|---|
| christiank | Here too ;-) | 08:43 |
| === mmrazik is now known as mmrazik|afk | ||
| leo2007 | any idea how to get bzr-grep installed? | 09:53 |
| mgz | leo2007: two ways | 09:54 |
| leo2007 | please | 09:55 |
| 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:56 |
| mgz | https://launchpad.net/bzr-grep has tarballs, or you can branch lp:bzr-grep | 09:57 |
| leo2007 | is it in 2.6b2? | 09:58 |
| mgz | ...I think not, will check | 09:58 |
| mgz | nope, that was r6536, grep merged r6555 | 10:00 |
| hikiko | hellp | 10:00 |
| hikiko | hello | 10:00 |
| hikiko | anybody available? | 10:00 |
| 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:02 |
| 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:08 |
| mgz | leo2007: ideally shortly, we're just lacking manpower to do it. | 10:09 |
| leo2007 | i see | 10:12 |
| leo2007 | I can wait ;) | 10:12 |
| 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:16 |
| leo2007 | cheers | 10:17 |
| mgz | signed with my key `gpg --recv-keys 0CDBF91C` | 10:18 |
| leo2007 | mgz: thanks, I am teaching ack.el to accept 'bzr grep' output and it is now done http://imagebin.org/230861 | 10:37 |
| mgz | leo2007: ace! | 10:50 |
| * christiank is away: Lunch | 11:37 | |
| === mmrazik|afk is now known as mmrazik | ||
| * christiank is back (gone 00:30:56) | 12:08 | |
| bob2 | christiank, probably want to turn that off | 12:37 |
| === yofel_ is now known as yofel | ||
| === dpb_ is now known as Guest91546 | ||
| christiank | bob2: thanks for the tip, should be off now. Testing... | 14:32 |
| christiank | bob2: nothing should have appeared, I assume. | 14:33 |
| === jml` is now known as jml | ||
| 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 | 16:57 |
| === deryck is now known as deryck[lunch] | ||
| delinquentme | how to drop back to a particular revno? | 20:21 |
| delinquentme | bzr revert -r 19 | 20:23 |
| fullermd | Depends on what you mean by 'drop back'. update may be better suited. | 20:25 |
| delinquentme | how about a diff between two revnos? | 20:27 |
| 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:28 |
| delinquentme | ok so it seems thats for two branches | 20:33 |
| delinquentme | how about two files? | 20:33 |
| 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:41 |
| abentley | delinquentme: It means there's no such file. Perhaps you're not specifying a relative path? | 20:43 |
| 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:05 |
| bob2 | well you will need to read docs for each new tool you use, yes | 22:08 |
| delinquentme | bob2, this is a discussion channel no? | 22:09 |
| bob2 | sure | 22:09 |
| fullermd | I'm still really not sure what you mean by branches being files... | 22:14 |
Generated by irclog2html.py 2.7 by Marius Gedminas - find it at mg.pov.lt!