| poolie | beuno, yes, that does look really nice | 00:01 |
|---|---|---|
| evarlast | anyone run bazaar multi-user server? you using SSH? Is there an http option? | 00:18 |
| lifeless | evarlast: most folk use ssh | 00:19 |
| lifeless | you can use http/https | 00:19 |
| evarlast | does loggerhead get me anything there? | 00:20 |
| lifeless | loggerhead is unrelated to this | 00:20 |
| evarlast | ok, thanks. I didn't know if loggerhead got me anything in terms of server writes. | 00:21 |
| evarlast | I think I will go the ssh route, since it seems most popular. | 00:21 |
| evarlast | its just we are an all windows shop, and so SSH is a little strange | 00:22 |
| lifeless | I know the UK NHS uses bzr on windows | 00:22 |
| lifeless | with IIS doing http server for writes | 00:22 |
| evarlast | err.. myabe I will do smart server via http | 00:22 |
| fynn | beuno: looks like the output of "bzr log" is Yaml. | 00:23 |
| lifeless | awilkins that hangs here from time to time may have written up stuff about this already on the wiki | 00:23 |
| fynn | I can just parse that. | 00:23 |
| lifeless | I know he sent patches is to make it | 00:23 |
| lifeless | work | 00:23 |
| lifeless | fynn: 'bzr log' ? Its not yaml | 00:23 |
| spiv | lifeless: oh, I didn't know about that. That's cool. | 00:26 |
| === mark1 is now known as markh | ||
| === jamesh_ is now known as jamesh | ||
| lifeless | spiv: which 'that' - the git book? | 01:04 |
| lifeless | spiv: or the IIS stuf? | 01:04 |
| spiv | lifeless: the IIS stuff. | 01:04 |
| lifeless | yah, it is cool :) | 01:04 |
| spiv | or maybe I did and had forgotten, some thing ;) | 01:04 |
| === sdboyer is now known as eclipse | ||
| === eclipse is now known as sdboyer | ||
| Peng_ | beuno: ping? | 01:34 |
| Peng_ | beuno: Never mind about the ping. I just filed bug 289708. | 01:49 |
| ubottu | Launchpad bug 289708 in loggerhead "abstract_paths breaks InventoryUI: 'Container' object has no attribute 'absolutepath'" [Undecided,New] https://launchpad.net/bugs/289708 | 01:49 |
| Peng_ | Oh, that should have a really trivial fix. | 01:58 |
| spiv | poolie: I'll call you after lunch | 02:03 |
| poolie | good idea :) | 02:03 |
| spiv | :) | 02:03 |
| === mark1 is now known as markh | ||
| spiv | poolie: is now a good time to call? skype or pots? | 03:23 |
| poolie | spiv, hi | 03:23 |
| lifeless | poolie: gimme a call when you return | 04:42 |
| poolie | lifeless, hi, i'm back, was on the phone to spiv | 05:13 |
| poolie | is it urgent or should i finish with him? | 05:13 |
| lifeless | not urgent | 05:13 |
| poolie | lifeless, want to talk? | 06:38 |
| vila | hi all | 06:59 |
| * vila is now in winter time | 07:00 | |
| spiv | vila: hello | 07:04 |
| spiv | vila: ah, that's why you're even later :) | 07:04 |
| vila | spiv: hehe, this remark was in a large part for you :) | 07:05 |
| poolie | hello vila | 07:16 |
| beuno | Peng_, thanks | 08:25 |
| === abentley1 is now known as abentley | ||
| === mark1 is now known as markh | ||
| Peng_ | beuno: Great. Thanks for merging it. :) | 09:18 |
| philn | hi | 09:18 |
| philn | i did a tarball of a branch to move it to another computer but now on the new location i get a ....NoSuchRevision: KnitPackRepository('file:///home/phil/bzr/.bzr/repository/') has no revision phil@base-.... | 09:19 |
| philn | is there a way to fix that? | 09:19 |
| Peng_ | philn: Maybe you tarred up the branch but not the repo? | 09:20 |
| philn | yep | 09:20 |
| philn | is there a way to resync the repo with the branch? | 09:20 |
| Peng_ | "bzr push"? :P | 09:21 |
| philn | haha :D | 09:22 |
| Peng_ | philn: But I'm not joking. | 09:23 |
| Peng_ | philn: You could also try again, tarring up the repo too this time. | 09:23 |
| Peng_ | philn: Use "bzr info" inside the branch to see where the repo is. | 09:23 |
| beuno | if you want it to be standaole | 09:23 |
| beuno | you probably want to bzr branch from it | 09:23 |
| beuno | so you get a standalone branch | 09:23 |
| philn | problem is that the repo is at home, i don't have access until the end of the day | 09:24 |
| beuno | ah, then you can't really work around that | 09:25 |
| Peng_ | You should run sshd on your home machine. :D | 09:25 |
| philn | bzr reconcile! | 09:25 |
| mwhudson | i frigging hate util.Container, fwiw | 09:27 |
| Peng_ | Heh. | 09:28 |
| Peng_ | mwhudson: Are you gonna make it go away during the EPIC thing? ;) | 09:29 |
| * Peng_ hides | 09:29 | |
| mwhudson | Peng_: doubt it | 09:30 |
| philn | gosh that reconcile thing is taking ages | 09:51 |
| luks | what are you trying to reconcile? the missing repository? | 09:51 |
| philn | i launched it without args, so i guess... yes | 09:53 |
| luks | well, it won't help you | 09:53 |
| luks | if you are missing some data, you are missing the data, it can't make them up | 09:53 |
| philn | ok, so ... would it be possible to uncommit and recommit? i have like... 3 or 4 "new" commits in that branch | 09:58 |
| luks | ok, maybe I don't understand the situation there | 09:59 |
| luks | can bzr log should you the revisions? | 09:59 |
| luks | *show | 09:59 |
| philn | no, bzr log fails | 10:01 |
| philn | i think i'll end up doing a diff and recreate the branch from scratch | 10:01 |
| luks | can diff show you the revisions? | 10:02 |
| spiv | philn: commit and uncommit work on the repository -- the bit that you didn't copy into your tarball. | 10:03 |
| spiv | philn: i.e. you didn't copy any of the history. | 10:03 |
| philn | ok, let's use the good old diff method. | 10:04 |
| Peng_ | philn: You have *no* history. You can't do *anything*. | 10:04 |
| Peng_ | philn: The only thing you can do is create a 100% new branch, completely unrelated to your old one. | 10:04 |
| Peng_ | philn: There are no other options. You simply don't have the data. | 10:05 |
| philn | yep i'll do that, i'll do a diff between the borken branch and the upstream one | 10:05 |
| Peng_ | Yeah, you can do that. :) | 10:05 |
| Peng_ | Wait, you have a copy of the upstream branch? What do you mean? With history? | 10:06 |
| philn | yes i have the upstream branch, it has evolved a bit since then, but i can work with that | 10:07 |
| Peng_ | Well, it's not a major catastrophe then. You could make a new branch off of the upstream, commit your current working tree, work work work, and merge it back into your original branch when you get home. | 10:09 |
| Peng_ | It'll create some cruft in the history (especially if you created any new files), but it won't b a huge problem. | 10:09 |
| Peng_ | Your other option is to drive home and grab the rest of your data, of course. :P | 10:09 |
| Peng_ | Or you could just not commit any of your work today, finally doing it when you get home. Not great, but doable. | 10:10 |
| Peng_ | do-able? | 10:10 |
| === mvo_ is now known as mvo | ||
| philn | nah can't wait, that branch is so cool | 10:13 |
| philn | can i safely interrupt a bzr reconcile process? | 10:14 |
| Peng_ | Probably. It made a backup of the repo first, so unless you deleted it.. | 10:15 |
| philn | ok, thx | 10:19 |
| philn | next problem: i do bzr serve on my LAN, but my buddy fails to connect... i have no running firewall | 10:48 |
| philn | i don't even see the socket when i do netstat -n | 10:53 |
| === abentley1 is now known as abentley | ||
| philn | oh should work now with --port=ip:port | 10:54 |
| dissonans | hi | 11:48 |
| dissonans | I'm trying to create a bazaar-managed branch of an svn-repository | 11:49 |
| dissonans | what's the best way of accomplishing this? | 11:49 |
| dissonans | I just tried the svn-push command (of bzr-svn), which failed with an assertion error | 11:49 |
| === gour_ is now known as gour | ||
| beuno | lifeless, any idea on why I would get a traceback with the latest bzr-search and loggerhead? http://paste.ubuntu.com/63208/ | 12:00 |
| beuno | any API changes I should be aware of? | 12:00 |
| Peng_ | Eh? Traceback? Where? | 12:02 |
| === mark1 is now known as markh | ||
| === abentley1 is now known as abentley | ||
| [cliff] | hi all! | 14:17 |
| [cliff] | is there a way to merge two branches from different repositories? ie. I have two projects that I'd like to merge into one without loosing history on them | 14:17 |
| Kinnison | Yes | 14:33 |
| Kinnison | (providing certain constraints are met) | 14:33 |
| Kinnison | E.g.: | 14:33 |
| Kinnison | To take project 'inner', and merge it into project 'outer' such that everything in 'inner' is inside a directory in the merged project, you could do: | 14:34 |
| Kinnison | In the 'inner' tree: mkdir inside; bzr add inside; bzr mv everything_else inside/ | 14:34 |
| Kinnison | then commit that | 14:34 |
| Peng_ | That's hardly history-preserving.. | 14:34 |
| Kinnison | then in the 'outer' tree: bzr merge -r 0..-1 /path/to/projects/inner | 14:35 |
| Kinnison | That merges the entire of the "inner" project into the "outer" project | 14:35 |
| Kinnison | If you look at the branch at http://bzr.digital-scurf.org/trees/managed/aranha/devel then you'll see that branch has several bits merged in together | 14:36 |
| [cliff] | Kinnison: looks good, i'll give that one a try, cheers mate | 14:40 |
| Kinnison | do it in copies, in case it goes wrong :-) | 14:41 |
| [cliff] | Kinnison: no need, it won't break anything -- famous last words lol | 14:42 |
| Kinnison | Anyone here know if loom has been updated to work with modern bzr? | 14:46 |
| Kinnison | I just upgraded my bzr, and lo, loom stopped working | 14:46 |
| Kinnison | :-( | 14:46 |
| thumper | Kinnison: ask abentley | 14:48 |
| [cliff] | Kinnison: it actually worked flawlessly :-) thanks a lot | 14:48 |
| abentley | Kinnison: See lp:~abentley/bzr-loom/stuff | 14:49 |
| Kinnison | [cliff]: you're welcome | 14:52 |
| Kinnison | abentley: I'll give that a go, one sec | 14:52 |
| Kinnison | abentley: Yay, Loom recorded. | 14:53 |
| * Kinnison hugs abentley | 14:53 | |
| thumper | abentley: ping | 14:54 |
| abentley | thumper: pong | 14:54 |
| thumper | abentley: can I borrow you for a minutes? | 14:54 |
| sven_ | hi! when running 'bzr gci' using the latest dev branch of bzr-gtk and the latest dev branch of bzr, i can't write per-file commit comments any more. the text box for per-file commits does not show up when i click on a file in the list to the left. | 16:28 |
| === james_w` is now known as james_w | ||
| EarthLion | hey if i have made a checkout | 18:34 |
| EarthLion | how can i remove this? | 18:34 |
| EarthLion | can i just remove the .bzr folder? | 18:34 |
| EarthLion | will that have any effect on the branch i made a checkout of? | 18:34 |
| Verterok | EarthLion: Hi, remove what? | 18:37 |
| EarthLion | stop it being a checkout/branch | 18:38 |
| Verterok | EarthLion: bzr export /path/to/dest | 18:38 |
| Verterok | but you can just remove the .bzr dir | 18:39 |
| EarthLion | thanks | 18:39 |
| === tetha_ is now known as tetha | ||
| LarstiQ | EarthLion: depending on what you do that may or may not be a good idea | 18:42 |
| EarthLion | ../? | 18:42 |
| LarstiQ | s/you/& want to/ | 18:42 |
| epsy | hi, I did not understand what bzr-notify from the bzr-gtk package was meant to do | 19:00 |
| epsy | I tried branching off launchpad to try and got no libnotify popup, which is what i expected | 19:00 |
| === mw is now known as mw|food | ||
| LarstiQ | epsy: there are two parts to commit notification. The listener that does the pop up (bzr-notify), and the broadcaster (lan-notify from bzr-dbus iirc) | 19:14 |
| epsy | ah right | 19:16 |
| dobey | hey. does bzr use the merge request stuff in launchpad? | 19:45 |
| NfNitLoop | dobey: what do you mean by that? | 19:47 |
| NfNitLoop | I'm pretty sure a merge request is only stored in the launchpad UI, not in bzr anywhere. | 19:48 |
| beuno | dobey, you mean bzr the project? | 19:48 |
| dobey | beuno: yes | 19:49 |
| dobey | i've made a branch to use $XDG_CONFIG_DIR/bazaar as the config dir instead of ~/.bazaar, and i'd like to propose it for merging into trunk | 19:50 |
| beuno | dobey, no, we're not | 19:51 |
| beuno | we use bundlebuggy through the bzr mailing list | 19:51 |
| beuno | let me find you a link on how to submit vode.. | 19:51 |
| dobey | ok | 19:51 |
| beuno | dobey, http://bazaar-vcs.org/BzrGivingBack | 19:54 |
| LarstiQ | dobey: that usually resolves to ~/.config/bazaar, right? | 19:55 |
| dobey | LarstiQ: yes, that is the default | 19:55 |
| LarstiQ | dobey: cool | 19:55 |
| dobey | ooh. and i see there is a bug requesting it too | 20:00 |
| === mw|food is now known as mw | ||
| dav_ | hi, sorry for the easy question, but how can I update an existing branch with bazaar? I tried with "bzr update nameOfTheProject" but it doesn't work, what do I get wrong? Thanks | 20:32 |
| Jc2k | dav_: in the branch directory, just do bzr pull... | 20:33 |
| dav_ | Jc2k, ok thanks, i'm an idiot :) cheers! | 20:34 |
| Jc2k | dav_: good luck :) | 20:40 |
| poolie | good morning | 21:05 |
| poolie | jam, hi | 21:05 |
| LarstiQ | hi poolie | 21:06 |
| poolie | hi there | 21:06 |
| Verterok | mornin' poolie | 21:11 |
| poolie | hello .nl :) | 21:11 |
| LarstiQ | poolie: are we that special? :) | 21:15 |
| fullermd | Well, it's nice to see you there. Germany might have tripped in the dark overnight and stumbled into you, pushing you into the ocean. | 21:17 |
| LarstiQ | :) | 21:17 |
| === Guest46909 is now known as jelmer | ||
| jelmer | lifeless: fwiw, bzr-search made it into experimental (and I'll request a sync for Jaunty when it's open) | 21:38 |
| rockstar | jelmer, aren't we in freeze? | 21:41 |
| LarstiQ | jelmer: should I try to push a bzr-gtk import fix to lp? | 21:42 |
| jelmer | rockstar: Debian experimental isn't :-) | 21:42 |
| rockstar | jelmer, ah yes, jaunty. I was thinking intrepid. | 21:42 |
| rockstar | jelmer, is there a PPA for it currently? | 21:42 |
| jelmer | LarstiQ: what sort of fix? | 21:43 |
| jelmer | LarstiQ: if it's just a simple import fix, just push | 21:43 |
| LarstiQ | jelmer: 'import gobject' in bzr-notify | 21:43 |
| LarstiQ | now I just have to find my card reader | 21:43 |
| jelmer | LarstiQ: heh, ssh key from FSFE card? | 21:44 |
| * LarstiQ nods | 21:44 | |
| rockstar | jelmer, is also, is there a recent PPA build for bzr-svn? | 21:46 |
| rockstar | I can't get it installed on this machine, as its on intrepid, with bzr 1.8 | 21:46 |
| jelmer | rockstar: afaik it hasn't been uploaded to the PPA yet, there is a current package in Debian though | 21:47 |
| rockstar | jelmer, so you're not in control of that then? | 21:47 |
| jelmer | rockstar: no, I do the Debian packages (which eventually get imported into Ubuntu also), jam does the PPA | 21:48 |
| lifeless | jelmer: cool | 22:37 |
| zoke | on windows how does ssh and bzr work ? | 23:27 |
| === doko_ is now known as doko | ||
| lifeless | zoke: I don't know the exact details; what sort of thing are you wanting to know | 23:30 |
| zoke | How would I install ssh into my system for this to work ? | 23:30 |
| zoke | do I need to install it from cygwin ? do I even need it at all ? | 23:31 |
| lifeless | you can use putty | 23:31 |
| zoke | ok, I got it, apperently with the standard windows installer bzr comes with it's own stuff for ssh connnections, so I don't need to have ssh installed | 23:34 |
| === mark1 is now known as markh | ||
Generated by irclog2html.py 2.7 by Marius Gedminas - find it at mg.pov.lt!