| === Mario__ is now known as pygi | ||
| AmanicA | asabil: cool, I have a proof of consept of `bzr pull --dry-run` working! just need to write some tests now. (won't do over-eager TDD again...) | 00:24 |
|---|---|---|
| jelmer | happy new year everybody | 00:28 |
| AmanicA | thanx, you too | 00:29 |
| jelmer | ronny, thanks, you too! | 00:30 |
| jelmer | happy new year AmanicA (is it 2k9 over there yet?) | 00:30 |
| AmanicA | yes, for about 2:30 already | 00:31 |
| ronny | wb jelmer | 00:34 |
| === mark1 is now known as markh | ||
| === fawek|laptop_ is now known as fawek|laptop | ||
| maco | the little \ | / - spinner thing...is it normal for it to stop spinning during a push? | 02:33 |
| maco | oh it started moving again. i thought maybe it was hung. | 02:37 |
| djsiegel | Hi, I have a question. | 03:06 |
| djsiegel | So, one of our developers pushed r313 (https://code.edge.launchpad.net/~do-plugins/do-plugins/trunk) and gobbled up 9 days of revision history -- what is he doing wrong, and how to I revert those merges? | 03:07 |
| djsiegel | Can bzr revert pop those revisions? | 03:07 |
| djsiegel | Ok, branched at a pre-merge revision, did a backwards merge from trunk into the earlier revision, and published that. | 03:17 |
| djsiegel | haha | 03:17 |
| === fawek|laptop_ is now known as fawek|laptop | ||
| === Guest40549 is now known as jelmer__ | ||
| === Spaz is now known as shit_and_fail | ||
| === shit_and_fail is now known as Spaz | ||
| === asac_ is now known as asac | ||
| === asabil__ is now known as asabil | ||
| === fawek_ is now known as fawek | ||
| === fawek is now known as fawek|away | ||
| fullermd | Man, it sure is quiet here when everybody's hungover :p | 17:17 |
| * nDuff went to sleep early last night thinking today was a workday; now he's at the office and nobody's here. | 17:22 | |
| Jc2k | :p | 17:25 |
| fullermd | Whoah, that means you can actually get _work_ done. | 17:26 |
| === fawek|away is now known as fawek | ||
| dwt | Hey there, I'm trying to push a bzr project I was hacking on in the last two days to a svn repository I have | 20:28 |
| dwt | but I don't seem to be able to | 20:28 |
| dwt | and also googling only brought up http://samba.org/~jelmer/bzr-svn/FAQ.html | 20:29 |
| dwt | which seems to suggest to use svn-push instead of push | 20:29 |
| dwt | but that also doesn't work | 20:29 |
| dwt | could you guys give me a hint? | 20:29 |
| dwt | for reference, I have the svn side set up so that the folder exists where I want to push my bzr project into | 20:30 |
| dwt | https://ipx11390.ipxserver.de/svn/mhaecker/open-source/LiquidDemocracy/trunk | 20:30 |
| dwt | only, now how do I tell bzr to push to that location? | 20:30 |
| dwt | ah, the repository is viewable by http://xn--hcker-gra.net/trac/browser/open-source/LiquidDemocracy/trunk | 20:30 |
| dwt | for more information | 20:41 |
| dwt | I tried | 20:41 |
| dwt | bzr merge | 20:41 |
| dwt | Merging from remembered submit location svn+https://ipx11390.ipxserver.de/svn/mhaecker/open-source/LiquidDemocracy/trunk | 20:41 |
| dwt | The svn+ syntax is deprecated, use https://ipx11390.ipxserver.de/svn/mhaecker/open-source/LiquidDemocracy/trunk instead. | 20:41 |
| dwt | bzr: ERROR: Branches have no common ancestor, and no merge base revision was specified. | 20:41 |
| dwt | Well, I worked around this, by throwing the history away | 20:48 |
| dwt | and just checking it in to svn directly | 20:48 |
| dwt | still - is there a way to rescue the history here? | 20:48 |
| dwt | (apart from doing it by hand with patch and diff...) | 20:50 |
| dwt | ah well | 21:00 |
| dwt | other things to doo | 21:00 |
| dwt | see you | 21:00 |
| fdv | I'm getting an expat error when trying bzr up (bzr-svn) from a bound branch, 'RuntimeError: cannot load dispatch table from pyexpat' (http://rafb.net/p/ITgRjK79.html). Anybody have any idea what goes wrong? | 21:41 |
| fdv | googling drew a blank | 21:42 |
| Jc2k | fdv: it looks like your celementree is compiled against pyexpat, but its not installed any more? | 21:44 |
| fdv | uhm.. | 21:44 |
| fdv | well, it's my own python, just compiled it | 21:46 |
| fdv | so I guess I might have mucked up things | 21:46 |
| fdv | but pyexpat is there, and bzr was compiled against that | 21:46 |
| fdv | celementree, is that a bzr thing? | 21:46 |
| Jc2k | nope | 21:47 |
| fdv | ah, guess I lack that, then | 21:47 |
| fdv | I seem to lack paramiko as well, used to have that | 21:47 |
| Jc2k | what does this give you? | 21:48 |
| Jc2k | python -c "from pyexpat import expat_CAPI" | 21:48 |
| fdv | that's fine | 21:48 |
| fdv | I'll see if I can find celementree and install that | 21:49 |
| fdv | or is it part of python? | 21:49 |
| fdv | builtin | 21:49 |
| Jc2k | fdv: im reading this: http://svn.effbot.org/public/tags/celementtree-1.0.5-20051216/cElementTree.c | 21:50 |
| Jc2k | that error can only happen when its compiled with the USE_PYEXPAT_CAPI flag | 21:50 |
| Jc2k | the error occurs when expat_capi is NULL, which happens if pyexpat isnt there or possibly if its too old | 21:51 |
| fdv | hm, I'm getting an erie feeling | 21:51 |
| fdv | could be that I need to tell python where to find the libs runtime | 21:51 |
| Jc2k | pretty sure its not a bzr specific problem, though | 21:52 |
| fdv | quite probably | 21:53 |
| fdv | installing python in non-standard places isn't that simple | 21:53 |
| fdv | (or it might be me :)) | 21:54 |
| Jc2k | GNOME does it in jhbuild | 21:55 |
| Flimm | Is it possible to change a commit message of a revision that's not the latest one? | 22:02 |
| AmanicA | Flimm: the short answer is no | 22:05 |
| nDuff | Flimm, it's *possible*, but only with side effects | 22:05 |
| Flimm | OK, it's not a big deal, I just wanted to change lp:xxx to bug xxxx so that launchpad would turn them into links | 22:05 |
| fdv | Jc2k: I think I might have found the cause, pyexpat.so uses /lib/libexpat.so, but I'm pretty sure it's not built against that | 22:05 |
Generated by irclog2html.py 2.7 by Marius Gedminas - find it at mg.pov.lt!