{"thread":{"id":"19966","subject":"bzr to git syncing","startedAt":"2009-06-29T19:12:24Z","lastAt":"2009-08-31T07:49:43Z","messageCount":6,"participants":["David Reitter","Alex Bennee","Sverre Rabbelier","Ian Clatworthy"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"117173","messageId":"F84D4C0F-1CEF-4853-84DB-B7927CBE62B3@gmail.com","threadId":"19966","inReplyTo":null,"subject":"bzr to git syncing","fromName":"David Reitter","fromEmail":"david.reitter@gmail.com","sentAt":"2009-06-29T19:12:24Z","receivedAt":"2009-06-29T19:12:24Z","isPatch":false,"sender":{"key":"david.reitter@gmail.com","avatar":"https://gravatar.com/avatar/0b9f43c735737567aec3272fea5afa461ffa049f180103c1aab629aa6c1207f1?d=mp&s=160"},"body":"Does anyone have experience syncing a Bzr repository to git?\nI would ideally want two-way syncing, but even the bzr->git route \nwould be a start.\n\nWe're starting with a Git repo that was converted from CVS and it \nbeing kept up to date. The CVS repo will be converted to Bzr sooner \nor later, and at that point we'd need to sync from that one. We would \nneed to keep the revision IDs coherent, i.e. not re-convert.\n\nI have looked at the git-bzr scripts that go the fast-im/export route; \nthis fails unfortunately (bzr side I think). Also, I'm not sure if \nthat would preserve revids.\n\nIt strikes me that patches / merge bundles would be cleaner way to do \nthis.\n\n(If you care: The background of this is that Emacs is switching to \nBzr, but my downstream project, Aquamacs, and a bunch of Emacs devs \nwant to use git themselves, so I'm trying to find someone who can do \nthis.)\n\nThanks in advance for your suggestions.\n"},{"id":"122012","messageId":"b2cdc9f30908280902m22d594bam3c70259d4c296e52@mail.gmail.com","threadId":"19966","inReplyTo":"F84D4C0F-1CEF-4853-84DB-B7927CBE62B3@gmail.com","subject":"Re: bzr to git syncing","fromName":"Alex Bennee","fromEmail":"kernel-hacker@bennee.com","sentAt":"2009-08-28T16:02:22Z","receivedAt":"2009-08-28T16:02:22Z","isPatch":false,"sender":{"key":"kernel-hacker@bennee.com","avatar":null},"body":"2009/6/29 David Reitter :\n> Does anyone have experience syncing a Bzr repository to git?\n> I would ideally want two-way syncing, but even the bzr->git route would be a\n> start.\n\nI've a sneaking suspicion a breakage has been introduced to either the\ngit-bzr script or\nthe bzr fast-import module. I say this as I have successfully pulled\nfrom a bzr repo into\ngit before but having need to do it today and I get a crash in fast-import.\n\nA few quick questions:\n\n* What versions of git/bzr are you using (me: git 1.6.4, bzr 1.17)?\n* Which git-bzr script are you using (me:\nhttp://github.com/mcepl/git-bzr/tree/master)?\n\nI've attached the fast-import crash I'm seeing. Are you seeing the\nsame sort of failure?\n\n\n--\nAlex, homepage: http://www.bennee.com/~alex/\nhttp://www.half-llama.co.uk\n"},{"id":"122015","messageId":"fabb9a1e0908280919o412baeb1ka69968a93297ca59@mail.gmail.com","threadId":"19966","inReplyTo":"b2cdc9f30908280902m22d594bam3c70259d4c296e52@mail.gmail.com","subject":"Re: bzr to git syncing","fromName":"Sverre Rabbelier","fromEmail":"srabbelier@gmail.com","sentAt":"2009-08-28T16:19:29Z","receivedAt":"2009-08-28T16:19:29Z","isPatch":false,"sender":{"key":"srabbelier@gmail.com","avatar":"https://avatars.githubusercontent.com/u/3098?v=4"},"body":"Heya,\n\nOn Fri, Aug 28, 2009 at 09:02, Alex Bennee wrote:\n> I've attached the fast-import crash I'm seeing. Are you seeing the\n> same sort of failure?\n\nThe program you used to generate the stream (I assume git-bzr?) is\ngenerating an invalid mode, git understands '100644', '100755',\n'120000', and '160000'; the mode in the stream, '040000', is not\nsomething we understand.\n\n-- \nCheers,\n\nSverre Rabbelier\n"},{"id":"122023","messageId":"b2cdc9f30908281047p76c12029u21b100ae6d88fe93@mail.gmail.com","threadId":"19966","inReplyTo":"fabb9a1e0908280919o412baeb1ka69968a93297ca59@mail.gmail.com","subject":"Re: bzr to git syncing","fromName":"Alex Bennee","fromEmail":"kernel-hacker@bennee.com","sentAt":"2009-08-28T17:47:44Z","receivedAt":"2009-08-28T17:47:44Z","isPatch":false,"sender":{"key":"kernel-hacker@bennee.com","avatar":null},"body":"2009/8/28 Sverre Rabbelier :\n> Heya,\n>\n> On Fri, Aug 28, 2009 at 09:02, Alex Bennee wrote:\n>> I've attached the fast-import crash I'm seeing. Are you seeing the\n>> same sort of failure?\n>\n> The program you used to generate the stream (I assume git-bzr?) is\n> generating an invalid mode, git understands '100644', '100755',\n> '120000', and '160000'; the mode in the stream, '040000', is not\n> something we understand.\n\nYeah, it seems in bzr land it mean new directory which we don't care\nabout. The following patch makes it work. Apologies for failure to\ninline but Gmail would just corrupt it if I tried.\n\nI also had to patch the ref check code to accept bzr style branch\nnames but I suspect that patch should be kept out of the repo.\n\n\n-- \nAlex, homepage: http://www.bennee.com/~alex/\nhttp://www.half-llama.co.uk\n"},{"id":"122024","messageId":"fabb9a1e0908281049t64f06a2r5efa114c7bcdc468@mail.gmail.com","threadId":"19966","inReplyTo":"b2cdc9f30908281047p76c12029u21b100ae6d88fe93@mail.gmail.com","subject":"Re: bzr to git syncing","fromName":"Sverre Rabbelier","fromEmail":"srabbelier@gmail.com","sentAt":"2009-08-28T17:49:39Z","receivedAt":"2009-08-28T17:49:39Z","isPatch":false,"sender":{"key":"srabbelier@gmail.com","avatar":"https://avatars.githubusercontent.com/u/3098?v=4"},"body":"Heya,\n\n[+vcs-fast-import-devs]\n\nOn Fri, Aug 28, 2009 at 10:47, Alex Bennee wrote:\n> 2009/8/28 Sverre Rabbelier :\n>> On Fri, Aug 28, 2009 at 09:02, Alex Bennee wrote:\n>>> I've attached the fast-import crash I'm seeing. Are you seeing the\n>>> same sort of failure?\n>>\n>> The program you used to generate the stream (I assume git-bzr?) is\n>> generating an invalid mode, git understands '100644', '100755',\n>> '120000', and '160000'; the mode in the stream, '040000', is not\n>> something we understand.\n>\n> Yeah, it seems in bzr land it mean new directory which we don't care\n> about. The following patch makes it work. Apologies for failure to\n> inline but Gmail would just corrupt it if I tried.\n>\n> I also had to patch the ref check code to accept bzr style branch\n> names but I suspect that patch should be kept out of the repo.\n\nThis seems like a fine case for the new 'feature' command on bzr's export side.\n\n-- \nCheers,\n\nSverre Rabbelier\n"},{"id":"122172","messageId":"4A9B8097.4050702@canonical.com","threadId":"19966","inReplyTo":"fabb9a1e0908281049t64f06a2r5efa114c7bcdc468@mail.gmail.com","subject":"Re: [Vcs-fast-import-devs] bzr to git syncing","fromName":"Ian Clatworthy","fromEmail":"ian.clatworthy@canonical.com","sentAt":"2009-08-31T07:49:43Z","receivedAt":"2009-08-31T07:49:43Z","isPatch":false,"sender":{"key":"ian.clatworthy@canonical.com","avatar":null},"body":"Sverre Rabbelier wrote:\n> Heya,\n> \n> [+vcs-fast-import-devs]\n> \n> On Fri, Aug 28, 2009 at 10:47, Alex Bennee wrote:\n>> 2009/8/28 Sverre Rabbelier :\n>>> On Fri, Aug 28, 2009 at 09:02, Alex Bennee wrote:\n>>>> I've attached the fast-import crash I'm seeing. Are you seeing the\n>>>> same sort of failure?\n>>> The program you used to generate the stream (I assume git-bzr?) is\n>>> generating an invalid mode, git understands '100644', '100755',\n>>> '120000', and '160000'; the mode in the stream, '040000', is not\n>>> something we understand.\n>> Yeah, it seems in bzr land it mean new directory which we don't care\n>> about.\n\n> This seems like a fine case for the new 'feature' command on bzr's export side.\n\nHmm - I only added that 040000 stuff late last week and it *should* only\nbe output if you explicitly ask for extended metadata from bzr\nfast-export via the --no-plain option? If that's not the case, please\nraise a bug here: https://bugs.launchpad.net/bzr-fastimport.\n\nIan C.\n"}]}