| === jam1 is now known as jam | ||
| inductiveload | hi! i'm looking to rebase a branch of a repo onto the current head, but i'm not sure how to go about it. the branch is question is here: https://code.launchpad.net/~inductiveload/lubuntu-artwork/lubuntu-artwork | 12:55 |
|---|---|---|
| inductiveload | all i have on this machine is a checkout of that branch, though | 12:57 |
| rihnapstor | how to check bzr version ? | 13:01 |
| Peng | rihnapstor: "bzr version" | 13:16 |
| jelmer | inductiveload: rebase doesn't work very well in checkouts, so you may want to unbind it first | 14:01 |
| mgz | or just merge in trunk | 14:01 |
| jelmer | inductiveload: after that, just "bzr rebase /path/or/url/to/upstream/branch" should do the trick | 14:01 |
| jelmer | merge is usually a better idea, indeed :) | 14:02 |
| jelmer | mgz! | 14:02 |
| mgz | jelmer! | 14:02 |
| inductiveload | hmm, ok, i did a merge already (to an older head), so I can do that again | 14:06 |
| mgz | are you settled yet jelmer, or still a-roving? | 14:08 |
| Kakadu | hey | 14:24 |
| Kakadu | if i have a repo which is on the revision 5. Than I execute `bzr update` and there are some changes. How can I checkout *last* revision? | 14:25 |
| Kakadu | (It is automatization script so executing `bzr log` and looking for the latest number is not mine variant) | 14:26 |
| Kakadu | (I can parse log output but I want something more simple) | 14:27 |
| mgz | update does update the tree | 14:31 |
| Kakadu | I thought about that but it seems that `update` doen't. `bzr revert -rN` prints changes when switching revision and does not if N is the same revision. So I do `revert -r5` than `update` and than `revert -r5`. Nothing is printed. So, it seems that `bzr update` does not change revision number. | 14:33 |
| mgz | what's you actual setup? just a standalone branch? lightweight checkout? | 14:34 |
| Kakadu | I executed `bzr branch lp:ubuntu/ocaml-syck` and so some experiments | 14:35 |
| Kakadu | s/so /do / | 14:35 |
| mgz | you probably just don't want to use revert | 14:35 |
| mgz | that changes the tree contents, but doesn't change the revision | 14:36 |
| mgz | eg, instead, do `bzr branch -r5 lp:ubuntu/ocaml-syck` then cd in and do update - the right thing happens | 14:36 |
| Kakadu | I want to simulate situation when `bzr update` have added added information about some new commits | 14:36 |
| mgz | or, `bzr pull` rather there | 14:37 |
| mgz | update is for checkouts really | 14:37 |
| Kakadu | Got it! | 14:38 |
| Kakadu | mgz: many thanks | 14:38 |
| LarstiQ | mgz: my offer on providing you with some snow still stands, btw ;) | 14:53 |
| mgz | ha! sun today | 14:55 |
| mgz | we did get some snow falling this week, but it hasn't stuck | 14:56 |
| === deryck is now known as deryck[lunch] | ||
| === deryck[lunch] is now known as deryck | ||
| === iBasic is now known as BasicOSX | ||
Generated by irclog2html.py 2.7 by Marius Gedminas - find it at mg.pov.lt!