=== thumper is now known as thumper-afk
=== thumper-afk is now known as thumper
=== hloeung_ is now known as hloeung
sbarcteamI am on linux, using bzr 2.3->2.6 and have "beyond compare" diff tool.06:17
sbarcteamwhen I'm using bcompare for bzr diff of a single file, everything is OK.06:17
sbarcteambut, when I'm doing this for multitude of files, bzr is spawning each FILE in its own window.06:18
sbarcteamThis is even more annoying, b/c it does so sequentially: first file, then I need to close the next one, etc.06:18
sbarcteamWhat I'd want to have is something I have with mercurial: diffing creates 2 tmp dirs, and spawns beyondcompare SMARTLY to compare folders.06:19
sbarcteamThis means I get to see a bigger picture before diving into the diffs of individual files.06:19
sbarcteamIs there a hack to make bzr do this ?06:20
sbarcteam(I'm reading ext-merge page to see whether it can do this now... seems it's MERGE oriented)06:22
fullermdCould maybe script something up around export.06:22
sbarcteamIt is what I'm hoping to FIND, not script :)06:23
fullermdI'm not aware of anything to be found like that (though I've never looked for any such thing, so that's not exactly definitive)06:24
sbarcteamI am ... a bit surprised nobody is bothered by this.06:24
fullermdWell, I'm pretty sure I could count on one hand the number of times I've seen beyondcompare mentioned   ;)06:26
fullermdAnd probably have enough left over to play a mean game of Hungry Hungry Hippos.06:26
sbarcteamfullermd: not aware of hungry hungry hippos, but I'm still googling...06:56
fullermdIt's not particularly relevant to anything version-controlish   :p06:58
MerwinHaving two branches with a lot of diffs, I would like to generate a patch with only some of them. Like running a qdiff, and being and being able to select changes I want and click "generate patch" :P08:02
MerwinHow can I do this ? I was thinking about some tricks like merging my second branch in the first on, and then revert all the things I don't want. But this sounds a little tricky..08:06
bob2maybe you want filterdiff08:10
Merwinbob2: How does that work ?08:14
Merwinvila: An idea about how I can do this with Bazaar N08:24
vilaMerwin: well, depending on your needs, I can think of 2 ways: a manual one editing the patch file, an more automated one relying on setting up your tree so that it contains only the parts you want in the patch08:26
vilaMerwin: or may be just use 'bzr shelve'08:26
MerwinChanges are already commited so shelves can't work08:27
vilaMerwin: i.e. shelve the changes you don't want in the diff08:27
Merwin(Unless I missed something ?)08:27
vilaMerwin: uncommit in a temp branch ?08:27
MerwinThere's a lot of commits to uncommit :p08:27
fullermdThat would hardly work for scattered bits through the history...08:27
vilaMerwin: but I'm surprised by your use case, if it was committed why isn't it worth sharing ?08:27
fullermdI'd just make a temp branch, merge, then start merging out the bits you don't want.08:27
MerwinIn fatch I have to brand : the main one and one for feature A. The problem is that a small feature B has been made in branch of feature A. Now, I ant to extract this features from this branch to put it in the main branch...08:28
MerwinIn fatc I have two branches*08:28
vilaMerwin: If I had to do it myself, I'm sure I won't be able to get it right manually at the first try so I'd use a dedicated tree for that to make sure I can refine the patch08:29
MerwinSo basically, I made a diff between main branch and branch A (containing feature A & B), but I just want to keep feature B, and generate a patch for it :p08:29
vilaMerwin: right, so *I* would make sure that feature B can me merged cleanly to trunk by.... first building theat featureB branch without relying on feature A and I'll get the diff from there08:30
MerwinYes, seems a good idea, but... how to build branch B... I can't cherrypick commits from branch A because it's badly commited (mixed features in commits...)08:31
MerwinHum, maybe create a branch B from main branch, these merge branch A in it, and before commiting merge, shelving changes I don't want ?08:31
vilaMerwin: so, like fullermd said, start a new branch with feature A & B and remove the unwanted bits08:31
vilaMerwin: yeah, something like that08:32
Merwinokay thank you vila and fullermd08:32
vilaMerwin: and to avoid issues in the future, you probably want to not record that first merge with 'bzr revert --forget-merges' so you end up with a "stand-alone" patch08:32
MerwinThis won't revert changes, just remove the "pending merge" status ?08:33
vilaMerwin: failing to do so, once feature B is part of trunk, merging feature A will raise conflicts: "You did merge feature A in the past and removed bits, now you're merging feature A again. Do you want to add the removed bits again or leave them out ?"08:34
vilaMerwin: yes, it would forget which revisioins were merged, keeping only the changes as if you applied them manually08:34
Merwinhum ok, interesting I didn't know it08:34
MerwinThank you08:34
vilaMerwin: this is better understood by toying around with the various workflows in temp branches and looking at the result with 'bzr qlog'08:37
=== wedgwood_away is now known as wedgwood
ggherdovhi all. when you do "bzr qlog <branch1> <branch2> ... <branchN>" you see a diagram representing the relations btween all mentioned branches (the DAG actually). I always loved that feature. Is it documented somwhere in the website? I want to show it to a friends but I am too lazy to make the minimal example, take screenshots and all that. Is there any pretty pic on the web ?15:41
* ggherdov also: why http://bazaar.canonical.com/ shows just file listing? wasn't it a nice homepage back in the days ?15:42
* ggherdov looks like the redirection to http://bazaar.canonical.com/en/ is broken ...15:42
jelmerit does indeed look like that's broken..15:43
ggherdovnot good for the press ;-)15:44
ggherdovok ok i am doing my own screenshots... :-)15:46
ggherdov_err... can anybody try to connect to the link http://doc.bazaar-vcs.org/bzr.dev/en/user-guide/index.html#team-collaboration-distributed-style ? it takes 100% of my CPU and 95% of disk I/O... what the heck? I am trying on my ubuntu VM , firefox 20.0  and on my winXP workstation, same version of FFox. Whazat ?16:03
ggherdov_does it work fine to you?16:04
ggherdov_update, you dont need the fragment #team-collaboration-distributed-style in the url, it's just http://doc.bazaar-vcs.org/bzr.dev/en/user-guide/index.html that goes crazy.16:06
mgzredirect loop, really firefox should do something sane with that...16:07
mgzyou want http://doc.bazaar.canonical.com/bzr.dev/en/user-guide/index.html16:07
ggherdov_mgz: yep redirect loop. All firefox does is freezing my OS... good boy :-) thanks for the direct link16:09
ggherdov_in the command "bzr qlog <branch1> <branch2> ... <branchN>" , is there any requirement on <branch_i>'s ? like, do they need to share some history ? or can the be like random branches not even branched from the same origin ? like, can I do "bzr qlog lp:mysql-server lp:bzr" i.e. compare totally unrelated things?16:35
* ggherdov_ is gonna find out very soon16:36
mgzthey can actually be whatever I believe16:37
mgzit's a qlog only wonderment16:37
ggherdov_mgz ah nice16:37
ggherdovmgz: are you still around? just to say that you were right! you can actually do "bzr qlog lp:bzr lp:mysql-server" look: http://imgur.com/rDyYLIA18:16
ggherdovI just put some gimp incantation to make it fit in a viewable size18:17
* ggherdov gotta go18:18
mgzneat :)18:18
cjohnstonI'm trying to setup Jenkins to commit code to branches. I have jenkins setup on a machine. Right now there are two branches. Each branch needs a different 'launchpad user' to do the comitting. I see how to use different email addresses, but I'm not finding any help with how to use two different LP users to commit code. Is this possible?19:26
mgzthe easiest way would be to supply different BZR_HOME values19:33
mgzthen they could have different launchpad_username values set in each ~/.bazaar/bazaar.conf19:34
ggherdovHi all. Git folks have this page http://gitolite.com/1-basic-usage/tias.html that show a super simple way to simulate a real world workflow scenario. You do that and immediately can start playing and grasp what the system does in some situation that you might not understand very well. Is there a similar page for bzr? or, what are the correspondent commands to play the TIAS game in bzr (Try It And See) ?19:43
ggherdovbzr init-repo b ; bzr branch b c120:02
ggherdovwhy do I have "Not a branch: "b/.bzr/branch/": location is a repository." ?20:03
mgz...because you created b as a repo, not a branch20:04
mgzcompare to `bzr init b; bzr branch b c2`20:05
ggherdovmsg ah. thank you.20:05
ggherdovmsg by the way, just to be clear about my intent, I'd like to create a ... $thing (repository? branch?) called "b" to act as the "production", or "reference" line of development (like a central server let's say), and then to "fork" it into what I called "c1", which simulate one of the N developers that will contribute to it. The first names that came to my mind are "repository" for "b", and... "branch" for c1, .., c_n. Is my understanding wrong?20:12
ggherdovbasically c1, ..., c_n use b to communicate btween them, via push/pull20:13
mgzggherdov: see <http://doc.bazaar.canonical.com/bzr.dev/en/user-guide/core_concepts.html>20:14
ggherdovmsg ok20:14
* ggherdov calling mgz msg bcse of his dyslexia :-)20:15
ggherdovmgz: I think I got it. "bzr init-repo" create a repository, that can potentially contain *many* branches. Thus, "bzr branch" on a repo doesn't make any sense (I guess one can specify a branch inside that repo somehow). OTOH, "bzr init" create a single-repo-single-branch, which is a sort of "limited" repo since it's bound to have only one branch inside. Now, "bzr branch" on it makes sense since bazaar understand that you wanna fork the one and only20:28
ggherdovbranch in that repo. Am I close?20:28
cjohnstonmgz: is there a way to have each launchpad_username use the correct ssh key?20:33
mgzif both keys are available, they should just use the one that works, but I imagine you can set up something sane with the ~/.ssh/config20:35
lifelessmgz: nooo20:40
lifelessusername exchange happens before key probing20:41
lifelessmgz: (or I may misunderstand what you meant there)20:41
mgzthe username comes from the bazaar config20:41
mgzwe don't expose a way to pick which key to use, as far as I know20:42
mgzbut ssh will try all keys available locally, so if one launchpad account has one key, and the other has a different one, provided both are loaded it should be fine, no?20:42
cjohnstonI'm getting pubkey errors20:43
mgzcan you do `ssh -vv USER_A@bazaar.canonica20:44
cjohnstontwo keys exist. one key is on one LP account, the other is on another LP account20:44
mgzand the same for USER_B?20:44
lifelessmgz: yes, listing all the keyrings should work fine20:45
lifelessor you can just use the same key on both LP accounts.20:45
cjohnstonthey bot gave http://paste.ubuntu.com/569970520:45
mgzcjohnston: I brainoed, you want the correction, bazaar.launchpad.net20:46
cjohnstonhttp://paste.ubuntu.com/5699711/ http://paste.ubuntu.com/5699712/20:48
mgzthe first works, the second doesn't have the key20:49
mgzwhat's the name of the second private key locally?20:49
mgzyou just want IdentityFile that then in .ssh/config20:50
mgzyou can have multiple IdentityFile entries per host20:50
mgzHost bazaar.launchpad.net20:51
mgz    IdentityFile ~/.ssh/id_rsa20:51
mgz    IdentityFile ~/.ssh/qajenkinsbot20:51
mgzor similar20:51
cjohnstonok.. ty20:52
=== wedgwood is now known as wedgwood_away

Generated by irclog2html.py 2.7 by Marius Gedminas - find it at mg.pov.lt!