[00:51] <lduros> hello: is there a way when running bzr log to have a less-like pager
[00:51] <lduros> akin to git log?
[00:51] <lduros> it's dumping the whole revision log
[00:51] <lduros> currently
[00:54] <lduros> i'm using bzr qlog
[00:54] <lduros> but it would be nice to be able to do something like that from the terminal :-)
[01:01] <bob2> you can pipe to less
[01:01] <bob2> or there's a plugin
[01:24] <lduros> bob2: ok
[01:24] <lduros> bzr log | less
[01:24] <lduros> :-P
[01:24] <lduros> obviously... thanks
[05:12] <fullermd> Heh.  Just found a dirstate branch/repo lying around.
[05:18] <mgrandi> oh?
[05:20] <fullermd> It's probably not the only one.  But it's been some years since the last one I found.
[05:20] <mgrandi> what is a dirstate branch/repo
[05:20] <lifeless> fullermd: a branch to hack on dirstate, or a dirstate one ? and by dirstate do you mean packs ?
[05:21] <fullermd> lifeless: The latter.  And no, straight-up knits.
[05:21] <lifeless> mgrandi: dirstate is the codename for the working tree metadata file format.
[05:21] <lifeless> fullermd: wwwwin
[05:21] <fullermd> I sure hope I don't have any weaves still around.
[05:21] <mgrandi> ah
[05:22] <fullermd> mgrandi: Basically, a really old format.
[05:23] <fullermd> I think it basically proves that my $HOME is a dangerous neighborhood that it's best not to wander around in...
[06:33] <vila> hi all
[07:01] <mgz> morning!
[07:12] <jelmer> hey mgz
[07:14]  * mgz wombles around
[07:21] <vila> hey jelmer, mgz !
[10:54] <jml> ehy
[10:54] <jml> is there an easy way to get the diff between a merged revision and the tip of the branch that it merges in?
[10:55] <jml> I mean, bzr log -n0 -r $MERGE_REV will get me the tip of the branch's revno
[10:55] <jml> and then I can do a diff
[10:57] <mgz> do you mean like `bzr diff -r mainline:2.1.1` for instance?
[10:58] <mgz> I'm not quite sure which two revisions you want the diff between
[10:59] <mgz> jml: in your example, what is $MERGE_REV and what is the final diff command you run?
[10:59] <jml> umm...
[11:00] <jml> lp:subunit r165 is where lifeless merged a branch of mine in, making changes first
[11:00] <mgz> ah, that's the painful case then
[11:00] <mgz> you want to see what lifeless did right?
[11:00] <jml> bzr log -n0 -r165 |head to get the tip revision of my branchh
[11:00] <jml> mgz: yeah
[11:01] <jml> which turns out to be 162.2.26
[11:01] <mgz> there's no general case that works for that.
[11:01] <jml> and then bzr di -r 162.2.26..165
[11:01] <jml> mgz: because bzr allows arbitrary numbers of revision parents?
[11:01] <mgz> because you get the 163..164 changes mixed in as well
[11:01] <jml> ah
[11:01] <mgz> that's okay when the branch merged is pretty fresh
[11:08] <mgz> (or when you merge trunk like you did there)
[11:09] <mgz> I'm not seeing any way of getting to r162.2.26 from r165 either though.
[11:12] <mgz> given there may be more than one (left hand? I forget the term) parent, I'm not sure there is a command line way
[11:35] <lifeless> jml: difftastic
[11:35] <lifeless> mgz: ^
[11:35] <lifeless> abently wrote the general case as a plugin
[11:38] <mgz> lifeless: where is this to be found? <https://launchpad.net/+search?field.text=difftastic> doesn't help.
[11:38] <lifeless> https://launchpad.net/difftacular/trunk
[11:38] <mgz> ah, difftactular
[11:38] <lifeless> wrong name
[11:39] <lifeless> doesn't stick in my head for sime reason
[11:39] <mgz> leonardr happened to make the same slip in that review
[11:41] <jml> heh
[11:43] <lifeless> it might be nice to put that in the bzr plugin register, add to the bazaar project etc, but talk to abentley
[11:44] <lifeless> (it may be already, I dunno)
[13:26] <lduros> every time I commit using VC in emacs (C-x v v) or do bzr commit, it pushes in the same time to the remote branch
[13:26] <lduros> how can I prevent that? :-)
[13:28] <mgz> unbind your local branch
[13:29] <jml> how do I set the public location of a branch?
[13:30] <lduros> mgz: ok
[13:30] <lduros> bzr unbind ... so easy :-)
[13:30] <mgz> lduros: you might instead want to work in feature branches, then merge them in to the bound trunk and commit when done
[13:30] <lduros> I don't see why ppl love git so much
[13:30] <lduros> mgz: hmm, that might make sense
[13:31] <mgz> jml: there's a config command that works I think, sec
[13:31] <mgz> people love git because dvcses are great
[13:33] <mgz> jml: `bzr config public_branch=lp:foo`
[13:33] <lduros> mgz: it's like saying people only like apples, but in fact what they like in the apple is the concept of fruit?
[13:34] <mgz> with the caveat I'm not sure lp: actually works depending on when it gets resolved to bzr+ssh: exactly
[13:34] <mgz> lduros: yup, but apples are all they have growing in the garden
[13:34] <lduros> :-P
[13:34] <lduros> and it's one of the fruits with the most pesticides
[13:35] <lduros> bzr is more like organic strawberries
[13:37] <jml> mgz: ta
[13:37] <jml> mgz: I always forget which has _branch and which has _location
[13:38] <vila> jml: just use 'bzr config' and you get them all
[13:38] <mgz> vila: only if it's already set...
[13:38] <vila> rhaaa, public, sry
[13:54] <LarstiQ> jml: yeah, it would be nice to clean _branch vs _location up
[16:59] <pikkachu> when you're about to merge an old branch, do you merge upstream changes into the old branch first, or do you just merge the old branch directly?
[17:04] <mgz> pikkachu: generally just merge the old branch directly and resolve any conflicts
[17:04] <mgz> for some landing systems (like pqm which lp:bzr uses) you want to merge trunk first because the landing robot isn't smart enough to handle conflicts
[17:20] <pikkachu> ok thanks