=== SamB_irssi is now known as since [04:36] im most likely overlooking something very obvious. how can i check out or branch a previous milestone release from my local up to date branch [05:10] archangle25: bzr branch -r THAT_RELEASE new-branch-dir [05:12] spiv, ah thanks - i got it, bzr branch -rtag:mysql-5.6.10 mysql-5.6 local-release-5610 [06:57] Good morning vila, jelmer [06:57] how is everyone? [10:45] is there a shortcut for 'merge in another branch as mainline and present my local commits as a merge' ? [10:46] it would be something like : ( bzr branch . ../copy-of-me; bzr pull --overwrite ../mainline; bzr merge ../copy-of-me) [10:46] the same thing that bzr update does in a bound branch in fact (?) [10:57] quicksilver: cd otherbranch; bzr merge ../old-trunk would work [10:57] there is also merge-into or something [10:57] * LarstiQ checks [10:57] No, that's a subdir merge thing. [10:58] What you want is a merge --pivot or --reverse or something, but it doesn't exist. So, no, no shortcut. [10:58] Alternately, the shortcut is to always have a pristine trunk around to do the landings into. [11:07] fullermd: well this isn't the pristine trunk case [11:07] it's the two developers both working on a branch [11:07] ok well it depends what you mean by trunk :) [11:08] it would have been fine if both developers had had bound branches which is what I usually recommend anyway. [11:13] yikes. An innocent (and rather small) commit has just provoked a very time consuming repacking of everythin [11:14] over a minute repacking texts === marcoceppi_ is now known as marcoceppi === mmrazik is now known as mmrazik|afk === mmrazik|afk is now known as mmrazik === wedgwood_away is now known as wedgwood [14:09] vila, are you there? [14:42] Wiz_KeeD: partly [14:43] vila, i just wanted to thank you very much for your time yesterday.I'm by FAAAAR a pro or a regular with bzr but i'm using it almost to it's full eextent [14:43] ignore, commits, reverts, push-and-update, status, diffs, partial commits [14:43] Wiz_KeeD: hehe, thanks ;) [14:43] It's so much easier and safer, i feel great using it now, thanks a lot man! [14:43] you're welcome, thanks to you for the feedback === jordan_ is now known as jordan === jml_ is now known as jml [14:49] * Wiz_KeeD huggles === mmrazik is now known as mmrazik|afk === wedgwood is now known as wedgwood_away