=== jelmer is now known as Guest31952 === Guest31952 is now known as jelmer === Lasall42 is now known as Guest94533 === LoganCloud is now known as Guest59860 === SamB_ is now known as SamB === superfly_ is now known as superfly === zacts` is now known as zacts === spiv_ is now known as spiv === mthaddon` is now known as mthaddon === jml_ is now known as jml [11:18] hi [11:18] is 'bzr lp-propose-merge' supposed to work? [11:19] --help? [11:19] sure, but such http://pastebin.com/WWYauQbV backtrace on lack of arguments? [11:21] same when called with upstream branch given as argument [11:21] Well, that looks like a problem with your preferred browser. [11:22] jpds: firefox? [11:22] File "/usr/lib/python2.7/webbrowser.py", line 489, in register_X_browsers [11:22] register(browser, None, Chrome(browser)) [11:22] NameError: global name 'Chrome' is not defined [11:22] that's either a bug in your copy of python 2.7 or a bad interaction with lazy import [11:24] python issue 17541 [11:24] mkey [11:24] python -c "import webbrowser" [11:24] feel free to downstream that to ubuntu [11:25] ok [11:25] for now, you can probably downgrade your local copy of python [11:25] or just open browser [11:27] https://bugs.launchpad.net/ubuntu/+source/python2.7/+bug/1159737 [11:27] Launchpad bug 1159737 in python2.7 (Ubuntu) " Importing `webbrowser` module gives NameError in Python 2.7.4rc1 " [Undecided,New] [11:27] feel free to confirm === mmrazik is now known as mmrazik|lunch [11:30] thanks hrw [11:30] mgz: thanks for help [11:31] I will probably not be hit by that again knowing amount of times I use bzr ;) [11:35] have a nice day fellows === mmrazik|lunch is now known as mmrazik === elmo__ is now known as elmo === vednis is now known as mars === Guest94533 is now known as Lasall === Kraln- is now known as Kraln === wedgwoodz is now known as wedgwood_away [14:48] Does anyone know how to deal with bzrlib objects hanging on to transports which then get closed by the server due to inactivity? [14:48] I have a feeling this is what is causing most of the socket.error failures on the UDD importer [14:49] hm, tickles a vague memory === mmrazik is now known as mmrazik|otp [16:41] Hi, I am getting this error when I try to push to remote server. bzr: ERROR: These branches have diverged. See "bzr help diverged-branches" for more information. [16:42] I was able to push to remote server earlier but then I have made changes to both the server (local and remote) and committed the changes in both. Now when I push the from local to remote, he shows error [16:43] My local repo is upto date and that is what I want it to stay on remote as well [17:16] vedic: hi [17:16] Hi [17:17] vedic: you can discard the changes on the remote server by running 'bzr push --overwrite' [17:19] jelmer: It says: bzr push --overwrite [17:19] bzr: ERROR: No push location known or specified [17:19] vedic: you would still need to specify the remote location [17:31] jelmer: it says This transport does not update the working tree. See 'bzr help working-trees' for more information [17:32] vedic: that's because you have a working tree in the remote location === mmrazik|otp is now known as mmrazik [17:32] vedic: as the warning says, see 'bzr help working-trees' for more infiormation [17:32] jelmer: Should I use remove-tree [17:33] vedic: either that or 'bzr update' [17:35] jelmer: Ok, I did bzr remove-tree on remote location it did remove but few directories are not empty and it didn't remove. bzr update is giving error [17:35] vedic: 'bzr update' will no longer work if you removed the working tree [17:36] jelmer: opps [17:36] vedic: it's correct there are still files there, you've only removed the working tree, not the rest of the bzr files [17:36] jelmer: so can I push to remote location? [17:36] vedic: with --overwrite, yes [17:38] jelmer: ok, I did and now I have updated files in remote location with bzr checkout [17:38] jelmer: Thank you [17:38] jelmer: I would like to understand these things. Any tutorial you suggest? Online docs? [17:40] vedic: I think the main bzr docs have some background [17:41] ok