| === 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 | ||
| hrw | hi | 11:18 |
|---|---|---|
| hrw | is 'bzr lp-propose-merge' supposed to work? | 11:18 |
| mgz | --help? | 11:19 |
| hrw | sure, but such http://pastebin.com/WWYauQbV backtrace on lack of arguments? | 11:19 |
| hrw | same when called with upstream branch given as argument | 11:21 |
| jpds | Well, that looks like a problem with your preferred browser. | 11:21 |
| hrw | jpds: firefox? | 11:22 |
| mgz | File "/usr/lib/python2.7/webbrowser.py", line 489, in register_X_browsers | 11:22 |
| mgz | register(browser, None, Chrome(browser)) | 11:22 |
| mgz | NameError: global name 'Chrome' is not defined | 11:22 |
| mgz | that's either a bug in your copy of python 2.7 or a bad interaction with lazy import | 11:22 |
| mgz | python issue 17541 | 11:24 |
| hrw | mkey | 11:24 |
| mgz | python -c "import webbrowser" | 11:24 |
| mgz | feel free to downstream that to ubuntu | 11:24 |
| hrw | ok | 11:25 |
| mgz | for now, you can probably downgrade your local copy of python | 11:25 |
| hrw | or just open browser | 11:25 |
| hrw | https://bugs.launchpad.net/ubuntu/+source/python2.7/+bug/1159737 | 11:27 |
| ubot5 | Launchpad bug 1159737 in python2.7 (Ubuntu) " Importing `webbrowser` module gives NameError in Python 2.7.4rc1 " [Undecided,New] | 11:27 |
| hrw | feel free to confirm | 11:27 |
| === mmrazik is now known as mmrazik|lunch | ||
| mgz | thanks hrw | 11:30 |
| hrw | mgz: thanks for help | 11:30 |
| hrw | I will probably not be hit by that again knowing amount of times I use bzr ;) | 11:31 |
| hrw | have a nice day fellows | 11:35 |
| === 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 | ||
| maxb | 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 |
| maxb | I have a feeling this is what is causing most of the socket.error failures on the UDD importer | 14:48 |
| mgz | hm, tickles a vague memory | 14:49 |
| === mmrazik is now known as mmrazik|otp | ||
| vedic | 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:41 |
| vedic | 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:42 |
| vedic | My local repo is upto date and that is what I want it to stay on remote as well | 16:43 |
| jelmer | vedic: hi | 17:16 |
| vedic | Hi | 17:16 |
| jelmer | vedic: you can discard the changes on the remote server by running 'bzr push --overwrite' | 17:17 |
| vedic | jelmer: It says: bzr push --overwrite | 17:19 |
| vedic | bzr: ERROR: No push location known or specified | 17:19 |
| jelmer | vedic: you would still need to specify the remote location | 17:19 |
| vedic | jelmer: it says This transport does not update the working tree. See 'bzr help working-trees' for more information | 17:31 |
| jelmer | vedic: that's because you have a working tree in the remote location | 17:32 |
| === mmrazik|otp is now known as mmrazik | ||
| jelmer | vedic: as the warning says, see 'bzr help working-trees' for more infiormation | 17:32 |
| vedic | jelmer: Should I use remove-tree | 17:32 |
| jelmer | vedic: either that or 'bzr update' | 17:33 |
| vedic | 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 |
| jelmer | vedic: 'bzr update' will no longer work if you removed the working tree | 17:35 |
| vedic | jelmer: opps | 17:36 |
| jelmer | 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 |
| vedic | jelmer: so can I push to remote location? | 17:36 |
| jelmer | vedic: with --overwrite, yes | 17:36 |
| vedic | jelmer: ok, I did and now I have updated files in remote location with bzr checkout | 17:38 |
| vedic | jelmer: Thank you | 17:38 |
| vedic | jelmer: I would like to understand these things. Any tutorial you suggest? Online docs? | 17:38 |
| jelmer | vedic: I think the main bzr docs have some background | 17:40 |
| vedic | ok | 17:41 |
Generated by irclog2html.py 2.7 by Marius Gedminas - find it at mg.pov.lt!