=== mmrazik is now known as mmrazik|lunch === mmrazik|lunch is now known as mmrazik [11:43] Hi! [11:44] hey [11:44] Could anyone help me with a quick question bzr related? Since I remember a configuration option in bzr that disables ssh key authentication - I need it now but can't find it anywhere [11:44] I remember using it in the past [11:45] I'm guessing you mean you want read-only http access to launchpad rather than bzr+ssh? [11:46] Yes [11:47] remove launchpad_username from ~/.bazaar/bazaar.conf [11:47] I have no launchpad_username there ;) Checked that already [11:47] Ok, I did it differently [11:48] I simply switched to using http://* directly [11:48] But thanks! [11:48] really? what does `bzr config launchpad_username` say? [11:49] you can also remove the [Launchpad] section of authentication.conf to be sure, but that should be ignored if the name isn't in the main config === yofel_ is now known as yofel === AfC is now known as AfC|zzz [14:23] hey, I'm trying to use bzr join, I have two 2a branches, let's say A and B, I branch B to A/B (so it's inside the A branch), running bzr join B from root of A fails with: [14:23] bzr: ERROR: Cannot join B. Trees have the same root [14:23] is this expected? [14:24] I take it A is a fork of B? and wow, you really are trying to do things in the most convoluted ways possible. [14:25] no [14:25] A and B are independent [14:25] mgz: what is convulted about join? [14:26] is that actually true? experience says at least one of them is probably going to be something like a fastimport from git. [14:26] it is true (the are independent), and the other part you said is also true (B is an export from git, but it was never derived from A in any way) [14:26] a is lp:checkbox [14:26] b is lp:~zkrynicki/+junk/plainbox [14:27] no common ancestry in any way [14:27] I gave up trying to export the merged tree from git [14:27] as I was unable to fix the bugs in bzr-fastimport and bzr-git [14:27] so I thought that good old bzr join should work [14:29] mgz: is this a bug in bzr core or is the bzr join --help description just confusing and I'm doing something wrong on the basic level [14:29] zyga: as reported, join works fine. what's borked is your branches. [14:29] mgz: how are they borked? [14:30] (probably, I can't get the +junk one) [14:30] oh [14:30] sorry [14:30] typo [14:31] mgz: please try again === aquarius_ is now known as aquarius [14:33] zyga: if these are fairly old bzr branches they might both have the old constant tree root file id [14:34] jelmer: I don't undestand what that is [14:34] jelmer: checkbox is failry old if you look at the history [14:34] jelmer: one is a fastimport thing, the other is an oldish branch [14:34] mgz: ah [14:35] mgz: I guess the fastimport thing should be using rich roots then? [14:35] mgz: both branches use 2a format [14:36] mgz: what is the "constant tree root file id"? [14:36] ...I pretty much think helping you do this is a waste of time, because you're just making your branches more and more complicated... [14:36] mgz: could you explain what I'm doing wrong [14:37] what's the benefit of embedding a the history of the old project in a subdirectory of your new fork? [14:37] mgz: it's a requirement of the team leader, we wish to contiune working on the fork in the old repository [14:38] sure, but why that way around? [14:38] it would be better to just merge your changes into the existing code and not screw around with the structure surely... [14:38] mgz: how would I merge my changes into lp:checkbox? [14:39] mgz: and how is any of that explaining why bzr join is not working, is any of the repositories damaged? [14:39] mgz: is this a duplicate root file id issue? I think I missed an earlier part of the conversation [14:39] for the record: [14:39] (Pdb) e [14:39] BadSubsumeSource(Can't subsume into . Trees have the same root) [14:39] (Pdb) e.tree.get_root_id() [14:39] 'TREE_ROOT' [14:39] (Pdb) e.other_tree.get_root_id() [14:39] 'TREE_ROOT' [14:40] jelmer: zyga posted to an internal canonical list for reasons passing understanding, so you're missing some context [14:40] mgz: ah, I'll leave it to you then [14:40] mgz: what I posted to the caonical list was not related much, maybe apart from just trying various things to make this work, the join issue is separate IMHO [14:40] mgz: (you do know about the merge-into plugin?) [14:41] basically he created a new project on github as a fork of an existing bzr project, added the existing project as a submodule, and is now struggling to reintegrate the codebases [14:41] mgz: you are incorrect [14:41] mgz: plainbox is not a for of checkbox [14:42] zyga: was going to post what I understood from looking briefly and get you to correct anything I didn't understand, maybe I should do that [14:42] mgz: ok [14:42] mgz: we can move the discussion to a proper place if you'd like [14:42] mgz: basically I want to "join" two projects, one of which was in git another in bzr, into bzr [14:42] so, we could make the join work, but I'm unconvinced that's what you really want [14:43] mgz: anything that works is fine, fixing bugs in bzr is good if I can do that as a side effect [14:44] mgz: fixing bugs in bzr-fastimport would be good as well but I've yet unable to trace that issue to something I can report [14:44] can you explain what plainbox is to me briefly? it uses the checkbox code, and is described in the readme as a "plain replacement", but you're saying it's not a fork? [14:44] mgz: ditto to bzr-git [14:44] mgz: it's a rewrite that our team is doing [14:44] bzr-git is simple (I think, you missed pasting the error), you used submodules in your git branch, which aren't supported [14:44] mgz: since checkbox became unmaintainable and the team lead made a decision to rewrite it [14:45] so it is a fork? [14:45] mgz: I see, I didn't know they were unsupported [14:45] or... a redo from scratch? [14:45] mgz: no, it's a rewrite, not a fork [14:45] yes === mmrazik is now known as mmrazik|otp [14:45] then why integrate the histories? [14:45] it uses some of checkbox scripts in practice (hence the submodule) [14:45] but the core is independent [14:48] mgz: so is lp:checkbox broken in any way? [14:48] mgz: or is the plainbox bzr export broken? [14:49] depends what you're trying to do. [14:50] mgz: well, use bzr the way it's advertised so to speak, getting bzr join to work would be a good start [14:55] mgz: ? [15:00] writing an email. [15:00] thanks! === slank_away is now known as slank [15:20] everyone, for reference, unless something major happens, the most likely bzr branch for plainbox is going to be copied from lp:~zkrynicki/+junk/plainbox [15:20] we'll just need do decide if we want it in lp:plainbox or lp:~something/checkbox/plainbox [15:23] meh [15:23] wrong window :) === mmrazik|otp is now known as mmrazik === mmrazik is now known as mmrazik|otp === mmrazik|otp is now known as mmrazik === mmrazik is now known as mmrazik|afk_for_ === mmrazik is now known as mmrazik|afk [16:19] zyga: +metoo bug 1031773 and I'll get round to doing something about that [16:19] Launchpad bug 1031773 in Bazaar "Failed to run bzr" [High,Confirmed] https://launchpad.net/bugs/1031773 [16:20] your variation on the underlying problem was at least less obnoixious than the one hidetaka got... [16:20] looking [16:21] didn't want to just back the code out, but that's probably the sanest option... [16:22] mgz: osutils.rename calls systems 'mv'? [16:22] mgz: or is some part of python borked to return non-unicode, localized message? [16:22] Python 2 returns non-unicode, localised messages, when setlocale is called [16:22] ahh [16:24] it calls rename(2) underneath === yofel_ is now known as yofel === mmrazik|afk is now known as mmrazik === gmarkall_ is now known as gmarkall === deryck is now known as deryck[lunch] [23:51] Hello. I need some help at installing centralized workflow thing on a CentOS server [23:51] can someone help?