| ychaouche | Hi. Is there a tool that graphs bazaar branches ? | 09:31 |
|---|---|---|
| ychaouche | is that what bzr graph-ancestry does ? | 09:31 |
| ychaouche | do | 09:31 |
| ychaouche | mmm; not sure | 09:31 |
| mmrazik | ychaouche: maybe bzr qlog is what you are looking for? | 09:35 |
| mmrazik | I believe its in qbzr package | 09:36 |
| ychaouche | mmrazik: is this a a software package or a plugin ? | 09:36 |
| ychaouche | my distribution doesn't have a qbzr package | 09:37 |
| ychaouche | I'll google this | 09:37 |
| mmrazik | ychaouche: I think both. Its a plugin but on ubuntu its in qbzr package | 09:37 |
| mmrazik | the description of the package says: Graphical interface for Bazaar using the Qt toolkit | 09:38 |
| ychaouche | oh I have that in my plugins | 09:38 |
| === idnaria is now known as idnar | ||
| === mmrazik is now known as mmrazik|lunch | ||
| === mmrazik|lunch is now known as mmrazik | ||
| ychaouche | How to obtain that sort of diagram ? http://pastie.org/5506487 | 13:27 |
| ychaouche | I want this :http://i.imgur.com/TLHgQ.png but I only this : http://i.imgur.com/BCcqy.png | 13:27 |
| ychaouche | I only *see* this | 13:27 |
| jelmer | ychaouche: your history is linear, that's why it's showing it to you that way | 13:30 |
| ychaouche | jelmer: I don't understand | 13:34 |
| ychaouche | I created a branch right ? | 13:35 |
| ychaouche | or maybe you mean the only way to see the graphic split in two is when there are merges ? | 13:35 |
| ychaouche | pulls, to be more precise ? | 13:35 |
| vila | ychaouche: you seem to look at 'bzr qlog dev', try 'bzr qlog prod dev' i.e. look at the history of both branches at once | 13:39 |
| ychaouche | vila: thanks. I wasn't sure since I thought everything was inside the dev branch (even the prod history), but apparently it's not ? | 13:41 |
| ychaouche | vila: but still, I see just one line not two. So I guess this type of diagrams http://i.imgur.com/TLHgQ.png only applies for merges. | 13:42 |
| ychaouche | Right ? | 13:42 |
| vila | since you started the dev branch from the prod branch, the history of the prod branch is part of the history of the dev branch | 13:43 |
| vila | have you tried 'bzr qlog prod dev' ? | 13:43 |
| vila | if you still see a "single line" try committing something to prod, you will then see two "lines" | 13:44 |
| vila | if you then merge prod into dev, you'll see that the two histories are different (even if after the merge, the *content* is the same) | 13:45 |
| vila | even better, if you don't want to pollute your branches, try from scratch ;) | 13:46 |
| ychaouche | vila: thanks, I tried on a "foo" repo and saw the two branches | 13:51 |
| ychaouche | I'll try my first merge now | 13:52 |
| ychaouche | fake marge | 13:52 |
| ychaouche | merge | 13:52 |
| ychaouche | is there a bzr developer channel or is it ok to discuss plugin code here ? | 14:22 |
| vila | ychaouche: here is fine | 14:24 |
| ychaouche | I don't know what is causing this : http://pastie.org/5506718 | 14:31 |
| === slank_away is now known as slank | ||
| === mmrazik is now known as mmrazik|otp | ||
| === mmrazik|otp is now known as mmrazik | ||
| ychaouche | How do I know what branch I'm in ? bzr info doesn't give this information. I can however find something called "branch nick" in bzr log. Is this the good way to obtain the branch name ? | 16:23 |
| jelmer | ychaouche: 'bzr root' | 16:24 |
| ychaouche | jelmer: that gives me the current working directory actually | 16:25 |
| ychaouche | jelmer: bzr root == pwd | 16:25 |
| ychaouche | in my case | 16:25 |
| jelmer | ychaouche: that directory is apparently the branch you're in | 16:25 |
| jelmer | ychaouche: that directory is apparently the branch you're in | 16:25 |
| ychaouche | jelmer: yes but the branche name "dev" isn't mentionned anywhere | 16:28 |
| ychaouche | look : http://i.imgur.com/8ZMkB.png | 16:28 |
| ychaouche | that's because I created the branch in some other place and then put a copy in where the bzr root thinks it is. | 16:29 |
| ychaouche | look at the screenshot it explains it better | 16:29 |
| jelmer | ychaouche: I don't see why the branch name should be 'dev' | 16:30 |
| ychaouche | jelmer: because I created it via bzr branch prod dev | 16:30 |
| ychaouche | so it should be nicked dev, no ? | 16:30 |
| jelmer | the 'branch nick:' bit in the log file just means that commit was made on a branch with the nick name 'dev' | 16:30 |
| jelmer | you can set and retrieve the branch nick with the 'bzr nick' command | 16:30 |
| ychaouche | chaouche@fictive ~/.zdesktop/zimlets-deployed/_dev/com_feeder_sugarbee $ bzr nick | 16:31 |
| ychaouche | com_feeder_sugarbee | 16:31 |
| ychaouche | that's even worse hah | 16:31 |
| jelmer | ychaouche: you can set it yourself with 'bzr nick foo' | 16:32 |
| ychaouche | ok let me ask the question differently : suppose you have a prod branch and a dev branch. Now you go to your test server, and you have code there. The question is : how do you know if that code is from the prod branch or from the dev branch ? | 16:32 |
| ychaouche | that's the context of my question, maybe I didn't emphasis on that much. | 16:33 |
| ychaouche | s/much/enough/ | 16:33 |
| jelmer | ychaouche: run 'bzr nick dev' in the dev branch and 'bzr nick prod' in the production branch | 16:33 |
| ychaouche | and then ? | 16:34 |
| ychaouche | or let met ask the question differently again : suppose you created a branch via bzr init foo. Then you copy foo to another location (for example from your laptop to the test server). Now someone else logs in the test server. Does he have anyway of getting the string "foo" using any bazaar commands ? | 16:49 |
| ychaouche | if he cds to that directory ? (supposed you copied it under the name baz instead of foo) | 16:50 |
| === deryck is now known as deryck[lunch] | ||
| === deryck[lunch] is now known as deryck | ||
| LarstiQ | hmm, ychaouche always disappears before I get online | 18:19 |
| jelmer | LarstiQ: he is one of your alteregos ? | 18:19 |
| LarstiQ | jelmer: haha, no :) | 18:20 |
| === mwhudson_ is now known as mwhudson | ||
| Logan_ | jelmer: Hey, could you possibly do: $ requeue_package.py --full bzrtools # ? | 21:41 |
| Logan_ | I need that so that the branch can be imported properly. | 21:41 |
| jelmer | Logan_: sorry, I'm no longer at Canonical and thus no longer have access to jubany | 21:41 |
| Logan_ | oh, sorry about that | 21:42 |
| jelmer | Logan_: you probably want jam, mgz_ or vila | 21:42 |
| Logan_ | or james_w :P | 21:45 |
| james_w | Logan_, done | 22:05 |
| Logan_ | james_w: thanks :) | 22:05 |
| === spiv_ is now known as spiv | ||
Generated by irclog2html.py 2.7 by Marius Gedminas - find it at mg.pov.lt!
