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