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