=== jamesh_ is now known as jamesh
[03:34] <Meatball_py> hi, I'm new to bzr, is there any way to merge a bug fix that hasn't been merged by the "official" branch. For example, https://bugs.launchpad.net/+branch/~openerp-dev/openobject-addons/7.0-bug-1156215-rha is a bug fix branch, how can I merge it on my local branch?
[03:34] <ubot5> Launchpad bug 7 in Launchpad itself "Need help for novice translators" [High,Fix released]
[03:51] <spiv> Meatball_py: have you tried running "bzr merge THAT_URL" in your local branch?
[03:52] <spiv> Meatball_py: because that should do what you want (although note that 'bzr merge' will not commit the merge automatically; you need to run 'bzr commit' for that, just like any other edit you may make).
[04:42] <Meatball_py> spiv: thanks
=== cloudnar is now known as idnaria
=== jam1 is now known as jam
[15:03] <andrewk> hello
[15:06] <andrewk> i have installed the osx bundle for bazaar and everything is working apart from the explorer. When i enter bzr explorer into the terminal i get the following message 'bzr: ERROR: [Errno 60] Can't connect to host '192.168.1.66': Operation timed out'
[15:07] <andrewk> i am not sure what ip the message is referring to as when you first launch the explorer it is just opening the application and not looking to connect to anywhere else?
=== mthaddon is now known as mthaddon`
[15:30] <andrewk> got to go but as always i will check the irc logs for replies.
=== mthaddon` is now known as mthaddon
=== marcoceppi__ is now known as marcoceppi