| mgz | bah. | 00:14 |
|---|---|---|
| mgz | what's the easiest way of getting tree.get_file_text to actually give me text, as in no \r in lines... | 00:14 |
| mgz | horrible feeling the answer is "content filters" | 00:14 |
| vila | 526AAF67 | 00:20 |
| vila | pff wrong window :) | 00:20 |
| mgz | just have to skip the optimisation if os.sep != "\n" for now, | 00:21 |
| mgz | and down to one failure... | 00:21 |
| vila | PsyberS: there is https://edge.launchpad.net/bzr-update-copyright that sounds like a good starting point | 00:23 |
| vila | As if I was bored, I managed to break my boot partion map while formatting a new HD for backups... | 00:25 |
| vila | thanks to ubuntu-rescue-remix I managed to restore it, fix the FS, reinstall grub and viola, works again, interesting times indeed | 00:27 |
| vila | I wish you all less emotions tonight :) | 00:27 |
| mgz | yeay for computers. | 00:29 |
| vila | but enough for me tonight :) | 00:31 |
| mgz | submitted, Parth is going to hate reviewing that. | 01:05 |
| mgz | actually, 718 lines (+229/-297) 3 files modified isn't as bad as I thought it'd be | 01:06 |
| PsyberS | vila: thanks for the pointer, i think that updates the year so thats a start at least | 01:16 |
| PsyberS | hah, the author lives like 1.5 hrs away from me | 01:33 |
| Visualante | how do i restore a file? | 02:13 |
| Visualante | searching restore on launchpad didn't garner anything helpful | 02:13 |
| PsyberS | Visualante: bzr revert <file> | 02:27 |
| Visualante | thank you, PsyberS, i found another backup | 02:27 |
| Visualante | ../Filename instead of Filename :I | 02:28 |
| exarkun | Did I overhear that someone is already fixing the SIGWINCH bug? | 04:42 |
| lifeless | exarkun: already fixed, in 2.1.2 and 2.2b3, I think | 06:43 |
| === lifeless changed the topic of #bzr to: Bazaar version control | try https://answers.launchpad.net/bzr for more help | http://irclogs.ubuntu.com/ | Patch pilot: poolie | bzr 2.1.1 is out | bzr 2.1.2 is having binaries built for it | ||
| devilsadvocate | hi, i really, really need some help. for some reason anyone using windows who tries to update a bzr repo here causes an error 123 (incorrect filename/path/...). i've tried bzr-revert, bzr-uncommit to the last few commits. no good. (everyone's using a checkout of the same branch and commit to it) | 07:30 |
| devilsadvocate | does anyone know why this could happen / how i can sort it out? | 07:30 |
| devilsadvocate | oh, and everything works just fine on linux. also, the last commit was made from a windows box. | 07:32 |
| lifeless | have a look in your .bzr.log | 07:32 |
| lifeless | bzr --version will show you where that is | 07:32 |
| * devilsadvocate looks | 07:33 | |
| devilsadvocate | hrm | 07:38 |
| devilsadvocate | http://pastie.org/private/nqddav49gqvkgmjh13zbq | 07:38 |
| devilsadvocate | doesnt look very useful, though | 07:38 |
| devilsadvocate | however, those last few folders there were part of the commits which i uncommitted | 07:38 |
| devilsadvocate | and therefore shouldnt really be there | 07:38 |
| devilsadvocate | so how do I _really_ back out some commit? | 07:39 |
| devilsadvocate | hrm, I wonder if the : in that damn Thumbs.db:encryptable just irreversably destroyed my repository | 07:41 |
| wilx | Colon in a name on Windows? | 08:07 |
| wilx | That's syntax for data streams. | 08:07 |
| devilsadvocate | I'm not sure where the : came from. I'm guessing it was made by windows along with Thumbs.db. | 08:09 |
| devilsadvocate | maybe its a windows 7 thing | 08:09 |
| toabctl | is there a good howto for handling debian packages with bzr and launchpad? | 10:14 |
| toabctl | !launchpad | 10:14 |
| ubot5 | Launchpad is a collection of development services for Open Source projects. It's Ubuntu's bug tracker, and much more; see https://launchpad.net/ | 10:14 |
| === radoe_ is now known as radoe | ||
| zedtux | Hi all, I have a question: I've added the parameter create_signatures to my ~/.bazaar/bazaar.conf file and now when I do a commit it try to sign my commit (that's what I excepted) but my problem is that bzr don't take the right key. I have 2 or 3 GNUGpg keys. How to tell to bzr to use this other one ? | 12:16 |
| lifeless | signing_command | 12:19 |
| lifeless | see bzr help configuration | 12:19 |
| zedtux | thanks lifeless | 12:25 |
| zedtux | Thanks it works ! | 12:37 |
| zedtux | See u | 12:37 |
| === khmarbaise_ is now known as khmarbaise | ||
| === nlisgo_ is now known as nlisgo | ||
| mementomori | hi | 19:58 |
| mementomori | I've hit my first conflict and now I've meld with 3 panes: BASE, THIS, OTHER | 19:59 |
| mementomori | which file will be the resolved one? | 19:59 |
| mementomori | I suppose THIS but I'm not suse | 20:00 |
| mementomori | sure | 20:00 |
| === Meths_ is now known as Meths | ||
Generated by irclog2html.py 2.7 by Marius Gedminas - find it at mg.pov.lt!