[00:54] pl0sh: branches will automatically find a repo above them in the file system hierarchy, if the repo is on a server, readers/writers client need to be able to access it on the server [00:56] pl0sh: this is valid for all protocols between the client and server. bzr+ssh is the most efficient implementation these days and as such the preferred one if bzr is available on the server [00:57] pl0sh: which is true for freebsd [13:46] using fast-export/fast-import to convert a repo from hg to bzr seems to flip around a number of merge commits, resulting from a "mainline" (log withou -n0) composed of the commits of the merged branches, rather than the commits from trunk/default/whatever. Is this a known issue? Is there a way to fix it? [13:47] the repository looks correct on the hg side, with the "trunk" being the straight mainline and the rest branching from/merging into it. [15:47] masklinn: That seems pretty weird. You should probably begin by finding out if the flipping has occurred in the export or the import - i.e. is the fastimport data stream correct [16:01] maxb yep, checked further (by trying to trip through git as well), the issue is at the export from hg (I'm guessing bzr's hg export script and the hg-fast-export one for git floating around have the same origin, they yield the same flipped merge commits) [16:02] So I tripped through git via hg-git before importing back into bazaar, and that worked [18:00] Hi [18:00] Anyone here knowing where to suggest a new translation / report a translatopn bug in the bzr explorer diff tool? === issyl0_ is now known as Guest46812 === Guest46812 is now known as issyl0 [20:22] hi lode, hi vila === yofel_ is now known as yofel [21:37] hi poolie, good early morning to you [21:49] hi jam [22:26] hiya [22:26] mathrick@hatsumi:[...]/BMB/tools/lib-overrides$ bzr join cl-gtk2/ [22:26] bzr: ERROR: File id {TREE_ROOT} already exists in inventory as InventoryDirectory('TREE_ROOT', u'cl-cairo2', parent_id='toolsliboverrides-20110525170907-q1x2hf7rrxb0i21i-1', revision=None) [22:26] hi there [22:26] jam, do you want to have a chat now [22:26] I get that when I try to join a repo after having previously joined another one [22:27] mathrick: hi, this is a bug [22:27] is there anything I can do to work around this? [22:27] i recognize it; I don't know a good workaround [22:27] do you, jam? [22:27] hm [22:27] poolie: ah, pity. Is it known and recorded somewhere? [22:27] somewhere being lpad of course :) [22:29] https://bugs.launchpad.net/bzr/+bug/370710 [22:29] Ubuntu bug 370710 in Bazaar "bzr: ERROR: File id {TREE_ROOT} already exists" [Medium,Fix released] [22:29] thanks [22:29] so there is a workaround there, though not an ideal one [22:32] poolie: hmm, the repo is pulled from github, is it expected then that it'll have a {TREE_ROOT} id? [22:32] through bzr-git/ [22:32] yes [22:33] hey poolie. I'm around a bit, but getting close to midnight here. So if it isn't too involved, certainly [22:33] is it imported by launchpad, or by you? [22:33] oh, hi [22:33] i was confused [22:33] i think i momentarily forgot you weren't still in Chicago [22:33] :) [22:33] can we set a time for this week, maybe your Tuesday morning? [22:34] poolie: whatever time works for you. Tues AM is good I think [22:34] poolie: me, I did bzr clone git://... [22:35] is 8 too early? [22:36] mathrick: hm i would have thought if you did that into a format 2a repository it would get a unique root id [22:36] is it a very old import? [22:37] poolie: yes and no, I first imported my old github branch which was made using bzr-git quite some time ago [22:37] hm actually that'd be 9am [22:37] but since I don't need that (I can grab the upstream directly and not pull on top of my own github branch), I'm trying that now [22:40] poolie: hmm, no, I still get it [22:40] mathrick@hatsumi:[...]/BMB/tools/lib-overrides$ bzr info cl-gtk2 [22:40] Standalone tree (format: 2a) [22:47] poolie: 9am should work, I usually get back around then after taking K to school. I'm off to bed for now, have a good day [23:00] poolie: any idea how I could look into the tree root not getting a proper id? [23:29] mathrick: so normally the initial add will give it a unique id [23:29] in bzr 2a formats and onwards [23:29] poolie: initial add? [23:30] the first 'bzr add' after 'bzr init' [23:30] i don't know if bzr-git is perhaps overriding that [23:30] hmm [23:30] or if it's just that you first made this branch earlier [23:30] has jelmer disappeared? I haven't seen him in a long time [23:30] hm, it may well be overriding it to get deterministic imports [23:30] poolie: I retried on a fresh clone and the same happens [23:30] he was on holiday last week and today (monday) [23:31] and the week before that we were sprintig [23:31] he would be the person to ask [23:42] poolie: right, but I didn't know about the holiday (though I kinda suspected that)