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