{"thread":{"id":"11314","subject":"Problem with git-svn","startedAt":"2007-12-16T10:30:04Z","lastAt":"2007-12-22T14:38:40Z","messageCount":11,"participants":["Pascal Obry","Peter Baumann","Eric Wong"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"63314","messageId":"4764FE2C.1010103@obry.net","threadId":"11314","inReplyTo":null,"subject":"Problem with git-svn","fromName":"Pascal Obry","fromEmail":"pascal@obry.net","sentAt":"2007-12-16T10:30:04Z","receivedAt":"2007-12-16T10:30:04Z","isPatch":false,"sender":{"key":"pascal@obry.net","avatar":"https://avatars.githubusercontent.com/u/467069?v=4"},"body":"\nI'm trying to use a Subversion repository with Git. I had\ngreat success with many repositories except one. This one\nlive since long time and as been migrated from CVS to\nSubversion.\n\nThe current Subversion repository contains multiple projects.\nEach project is under /trunk. While trying to import the project\nPROJ:\n\n  $ git svn clone svn+ssh://myserver/trunk/PROJ\n\nI get:\n\nInitialized empty Git repository in .git/\nW: Ignoring error from SVN, path probably does not exist: (160013):\nFilesystem has no item: File not found: revision 100, path '/trunk/PROJ'\nFound possible branch point: svn+ssh://myserver/importfromcvs/trunk =>\nsvn+ssh://myserver/trunk/PROJ, 48467\nInitializing parent: git-svn@48467\nW: Ignoring error from SVN, path probably does not exist: (160013):\nFilesystem has no item: File not found: revision 101, path\n'/importfromcvs/trunk'\nr9458 = b90789186c85a19a9f32ea6dc8a4259e2eadef67 (git-svn@48467)\n        A       file.el\n\nBut file.el is not part of this project, it is part of another one\non the same Subversion repository. It looks like git-svn get confused\nat some point. I've been trying to track this down, but since I've\nnever written a single Perl script that's not easy :(\n\nNote that AFAIK each CVS modules have been imported into\n/importfromcvs/trunk then move into /trunk/<MODULE_NAME>.\n\nr48467 seem ok as a branch point:\n\n<<\n------------------------------------------------------------------------\nr48468 | svn | 2007-05-09 15:10:54 +0200 (Wed, 09 May 2007) | 1 line\nChanged paths:\n   D /importfromcvs/trunk\n   A /trunk/PROJ (from /importfromcvs/trunk:48467)\n\nImporting module PROJ into SVN.\n>>\n\nSo I'm looking for hints about the possible problem.\n\nNote that I have tried to reproduce this with a small\nscript (using the same repository structure) but I was\nnot able.\n\nThanks,\nPascal.\n\n-- \n\n--|------------------------------------------------------\n--| Pascal Obry                           Team-Ada Member\n--| 45, rue Gabriel Peri - 78114 Magny Les Hameaux FRANCE\n--|------------------------------------------------------\n--|              http://www.obry.net\n--| \"The best way to travel is by means of imagination\"\n--|\n--| gpg --keyserver wwwkeys.pgp.net --recv-key C1082595\n"},{"id":"63319","messageId":"20071216135625.GB4999@xp.machine.xx","threadId":"11314","inReplyTo":"4764FE2C.1010103@obry.net","subject":"Re: Problem with git-svn","fromName":"Peter Baumann","fromEmail":"waste.manager@gmx.de","sentAt":"2007-12-16T13:56:25Z","receivedAt":"2007-12-16T13:56:25Z","isPatch":false,"sender":{"key":"waste.manager@gmx.de","avatar":null},"body":"On Sun, Dec 16, 2007 at 11:30:04AM +0100, Pascal Obry wrote:\n> \n> I'm trying to use a Subversion repository with Git. I had\n> great success with many repositories except one. This one\n> live since long time and as been migrated from CVS to\n> Subversion.\n> \n> The current Subversion repository contains multiple projects.\n> Each project is under /trunk. While trying to import the project\n> PROJ:\n> \n>   $ git svn clone svn+ssh://myserver/trunk/PROJ\n> \n> I get:\n> \n> Initialized empty Git repository in .git/\n> W: Ignoring error from SVN, path probably does not exist: (160013):\n> Filesystem has no item: File not found: revision 100, path '/trunk/PROJ'\n> Found possible branch point: svn+ssh://myserver/importfromcvs/trunk =>\n> svn+ssh://myserver/trunk/PROJ, 48467\n> Initializing parent: git-svn@48467\n> W: Ignoring error from SVN, path probably does not exist: (160013):\n> Filesystem has no item: File not found: revision 101, path\n> '/importfromcvs/trunk'\n> r9458 = b90789186c85a19a9f32ea6dc8a4259e2eadef67 (git-svn@48467)\n>         A       file.el\n> \n> But file.el is not part of this project, it is part of another one\n> on the same Subversion repository. It looks like git-svn get confused\n> at some point. I've been trying to track this down, but since I've\n> never written a single Perl script that's not easy :(\n> \n> Note that AFAIK each CVS modules have been imported into\n> /importfromcvs/trunk then move into /trunk/<MODULE_NAME>.\n> \n> r48467 seem ok as a branch point:\n> \n> <<\n> ------------------------------------------------------------------------\n> r48468 | svn | 2007-05-09 15:10:54 +0200 (Wed, 09 May 2007) | 1 line\n> Changed paths:\n>    D /importfromcvs/trunk\n>    A /trunk/PROJ (from /importfromcvs/trunk:48467)\n> \n> Importing module PROJ into SVN.\n> >>\n> \n> So I'm looking for hints about the possible problem.\n> \n> Note that I have tried to reproduce this with a small\n> script (using the same repository structure) but I was\n> not able.\n> \n> Thanks,\n> Pascal.\n> \n\nEric made a fix[1] this week so git-svn won't get confused if e.g. trunk\ngets deleted and later created (or e.g. moved). Could you check if it\nalso fixes your problem? At least there is some familiarity, because your\ntrunk/PROJ also get moved from outside a path git-svn isn't tracking.\n\n-Peter\n\n[1]: See this thread for more details\n     http://thread.gmane.org/gmane.comp.version-control.git/67665\n"},{"id":"63322","messageId":"476546D7.2030805@obry.net","threadId":"11314","inReplyTo":"20071216135625.GB4999@xp.machine.xx","subject":"Re: Problem with git-svn","fromName":"Pascal Obry","fromEmail":"pascal@obry.net","sentAt":"2007-12-16T15:40:07Z","receivedAt":"2007-12-16T15:40:07Z","isPatch":false,"sender":{"key":"pascal@obry.net","avatar":"https://avatars.githubusercontent.com/u/467069?v=4"},"body":"\nPete,\n\n> Eric made a fix[1] this week so git-svn won't get confused if e.g. trunk\n> gets deleted and later created (or e.g. moved). Could you check if it\n> also fixes your problem? At least there is some familiarity, because your\n> trunk/PROJ also get moved from outside a path git-svn isn't tracking.\n> \n> -Peter\n> \n> [1]: See this thread for more details\n>      http://thread.gmane.org/gmane.comp.version-control.git/67665\n\nThis fix is already installed into the Git version I'm using which is:\n\n   git version 1.5.4.rc0.36.g7680\n\nSo there is something else...\n\nThanks,\nPascal.\n\n-- \n\n--|------------------------------------------------------\n--| Pascal Obry                           Team-Ada Member\n--| 45, rue Gabriel Peri - 78114 Magny Les Hameaux FRANCE\n--|------------------------------------------------------\n--|              http://www.obry.net\n--| \"The best way to travel is by means of imagination\"\n--|\n--| gpg --keyserver wwwkeys.pgp.net --recv-key C1082595\n"},{"id":"63724","messageId":"20071219082751.GA17787@muzzle","threadId":"11314","inReplyTo":"4764FE2C.1010103@obry.net","subject":"Re: Problem with git-svn","fromName":"Eric Wong","fromEmail":"normalperson@yhbt.net","sentAt":"2007-12-19T08:27:51Z","receivedAt":"2007-12-19T08:27:51Z","isPatch":false,"sender":{"key":"e@80x24.org","avatar":null},"body":"Pascal Obry <pascal@obry.net> wrote:\n> \n> I'm trying to use a Subversion repository with Git. I had\n> great success with many repositories except one. This one\n> live since long time and as been migrated from CVS to\n> Subversion.\n> \n> The current Subversion repository contains multiple projects.\n> Each project is under /trunk. While trying to import the project\n> PROJ:\n> \n>   $ git svn clone svn+ssh://myserver/trunk/PROJ\n> \n> I get:\n> \n> Initialized empty Git repository in .git/\n> W: Ignoring error from SVN, path probably does not exist: (160013):\n> Filesystem has no item: File not found: revision 100, path '/trunk/PROJ'\n> Found possible branch point: svn+ssh://myserver/importfromcvs/trunk =>\n> svn+ssh://myserver/trunk/PROJ, 48467\n> Initializing parent: git-svn@48467\n> W: Ignoring error from SVN, path probably does not exist: (160013):\n> Filesystem has no item: File not found: revision 101, path\n> '/importfromcvs/trunk'\n> r9458 = b90789186c85a19a9f32ea6dc8a4259e2eadef67 (git-svn@48467)\n>         A       file.el\n> \n> But file.el is not part of this project, it is part of another one\n> on the same Subversion repository. It looks like git-svn get confused\n> at some point. I've been trying to track this down, but since I've\n> never written a single Perl script that's not easy :(\n\nHi,\n\nCan you show me the output of `svn log -v -r9458 svn+ssh://myserver/' ?\n\nThanks.\n\n> Note that AFAIK each CVS modules have been imported into\n> /importfromcvs/trunk then move into /trunk/<MODULE_NAME>.\n> \n> r48467 seem ok as a branch point:\n> \n> <<\n> ------------------------------------------------------------------------\n> r48468 | svn | 2007-05-09 15:10:54 +0200 (Wed, 09 May 2007) | 1 line\n> Changed paths:\n>    D /importfromcvs/trunk\n>    A /trunk/PROJ (from /importfromcvs/trunk:48467)\n> \n> Importing module PROJ into SVN.\n> >>\n\nSo did svn+ssh://importfromcvs/trunk/file.el at r9458?  If so, git-svn\nis behaving as expected.  If not, can you tell me where \"file.el\" was at\nr9458?\n\n> \n> So I'm looking for hints about the possible problem.\n> \n> Note that I have tried to reproduce this with a small\n> script (using the same repository structure) but I was\n> not able.\n\n-- \nEric Wong\n"},{"id":"63745","messageId":"47690031.7090409@obry.net","threadId":"11314","inReplyTo":"20071219082751.GA17787@muzzle","subject":"Re: Problem with git-svn","fromName":"Pascal Obry","fromEmail":"pascal.obry@gmail.com","sentAt":"2007-12-19T11:27:45Z","receivedAt":"2007-12-19T11:27:45Z","isPatch":false,"sender":{"key":"pascal@obry.net","avatar":"https://avatars.githubusercontent.com/u/467069?v=4"},"body":"Hi Eric,\n\n> Can you show me the output of `svn log -v -r9458 svn+ssh://myserver/'?\n\n$ svn log -v -r9458  svn+ssh://myserver/\n------------------------------------------------------------------------\nr9458 | (no author) | 1998-04-22 19:07:08 +0200 (Wed, 22 Apr 1998) | 1 line\nChanged paths:\n   A /importfromcvs\n   A /importfromcvs/branches\n   A /importfromcvs/tags\n   A /importfromcvs/trunk\n\nNew repository initialized by cvs2svn.\n------------------------------------------------------------------------\n\n> So did svn+ssh://importfromcvs/trunk/file.el at r9458?  If so, git-svn\n> is behaving as expected.  If not, can you tell me where \"file.el\" was at\n> r9458?\n\nfile.el was not imported at r9458 but at r9459, just after the creation\nof the /importfromcvs directories above.\n\n------------------------------------------------------------------------\nr9459 | author | 1998-04-22 19:07:08 +0200 (Wed, 22 Apr 1998) | 2 lines\nChanged paths:\n   A /importfromcvs/trunk/file.el\n\nInitial revision\n\n------------------------------------------------------------------------\n\nThanks,\nPascal.\n\n-- \n\n--|------------------------------------------------------\n--| Pascal Obry                           Team-Ada Member\n--| 45, rue Gabriel Peri - 78114 Magny Les Hameaux FRANCE\n--|------------------------------------------------------\n--|              http://www.obry.net\n--| \"The best way to travel is by means of imagination\"\n--|\n--| gpg --keyserver wwwkeys.pgp.net --recv-key C1082595\n"},{"id":"63872","messageId":"20071220183007.GA26767@untitled","threadId":"11314","inReplyTo":"47690031.7090409@obry.net","subject":"Re: Problem with git-svn","fromName":"Eric Wong","fromEmail":"normalperson@yhbt.net","sentAt":"2007-12-20T18:30:08Z","receivedAt":"2007-12-20T18:30:08Z","isPatch":false,"sender":{"key":"e@80x24.org","avatar":null},"body":"Pascal Obry <pascal.obry@gmail.com> wrote:\n> Hi Eric,\n> \n> > Can you show me the output of `svn log -v -r9458 svn+ssh://myserver/'?\n> \n> $ svn log -v -r9458  svn+ssh://myserver/\n> ------------------------------------------------------------------------\n> r9458 | (no author) | 1998-04-22 19:07:08 +0200 (Wed, 22 Apr 1998) | 1 line\n> Changed paths:\n>    A /importfromcvs\n>    A /importfromcvs/branches\n>    A /importfromcvs/tags\n>    A /importfromcvs/trunk\n> \n> New repository initialized by cvs2svn.\n> ------------------------------------------------------------------------\n> \n> > So did svn+ssh://importfromcvs/trunk/file.el at r9458?  If so, git-svn\n> > is behaving as expected.  If not, can you tell me where \"file.el\" was at\n> > r9458?\n> \n> file.el was not imported at r9458 but at r9459, just after the creation\n> of the /importfromcvs directories above.\n> \n> ------------------------------------------------------------------------\n> r9459 | author | 1998-04-22 19:07:08 +0200 (Wed, 22 Apr 1998) | 2 lines\n> Changed paths:\n>    A /importfromcvs/trunk/file.el\n> \n> Initial revision\n> \n> ------------------------------------------------------------------------\n\nAh, oops, I was off-by-one with the revision number.  But git-svn does\nlook to be doing the right thing here, because it followed history into\n/importfromcvs/trunk/ and file.el was part of it.\n\n-- \nEric Wong\n"},{"id":"63875","messageId":"476AD1AB.8040406@gmail.com","threadId":"11314","inReplyTo":"20071220183007.GA26767@untitled","subject":"Re: Problem with git-svn","fromName":"Pascal Obry","fromEmail":"pascal.obry@gmail.com","sentAt":"2007-12-20T20:33:47Z","receivedAt":"2007-12-20T20:33:47Z","isPatch":false,"sender":{"key":"pascal@obry.net","avatar":"https://avatars.githubusercontent.com/u/467069?v=4"},"body":"Eric,\n\n> Ah, oops, I was off-by-one with the revision number.  But git-svn does\n> look to be doing the right thing here, because it followed history into\n> /importfromcvs/trunk/ and file.el was part of it.\n\nYes part of it but before the creation of the /importfromcvs/trunk/ that\nwas moved later as /trunk/PROJ.\n\nIn /importfromcvs/trunk/ there was many projects imported. One per one,\neach time moving it into /trunk/PROJ.\n\nIf I look at history of /trunk/PROJ:\n\n   $ svn log svn+ssh://myserver/trunk/PROJ\n\nThe last revision is 45775, so I think git-svn should not look past this\nrevision. So I'm very surprised by the current behavior and think it is\na bug to import file.el at revision 9458. Note that the workaround for\nme is to use:\n\n   $ git svn clone svn+ssh://myserver/trunk/PROJ --revision=45775:HEAD\n\nBut it would be lot cleaner to have git-svn handling this properly I think.\n\nThanks,\nPascal.\n\n-- \n\n--|------------------------------------------------------\n--| Pascal Obry                           Team-Ada Member\n--| 45, rue Gabriel Peri - 78114 Magny Les Hameaux FRANCE\n--|------------------------------------------------------\n--|              http://www.obry.net\n--| \"The best way to travel is by means of imagination\"\n--|\n--| gpg --keyserver wwwkeys.pgp.net --recv-key C1082595\n"},{"id":"63876","messageId":"476AD1CE.1080408@obry.net","threadId":"11314","inReplyTo":"20071220183007.GA26767@untitled","subject":"Re: Problem with git-svn","fromName":"Pascal Obry","fromEmail":"pascal.obry@gmail.com","sentAt":"2007-12-20T20:34:22Z","receivedAt":"2007-12-20T20:34:22Z","isPatch":false,"sender":{"key":"pascal@obry.net","avatar":"https://avatars.githubusercontent.com/u/467069?v=4"},"body":"Eric,\n\n> Ah, oops, I was off-by-one with the revision number.  But git-svn does\n> look to be doing the right thing here, because it followed history into\n> /importfromcvs/trunk/ and file.el was part of it.\n\nYes part of it but before the creation of the /importfromcvs/trunk/ that\nwas moved later as /trunk/PROJ.\n\nIn /importfromcvs/trunk/ there was many projects imported. One per one,\neach time moving it into /trunk/PROJ.\n\nIf I look at history of /trunk/PROJ:\n\n   $ svn log svn+ssh://myserver/trunk/PROJ\n\nThe last revision is 45775, so I think git-svn should not look past this\nrevision. So I'm very surprised by the current behavior and think it is\na bug to import file.el at revision 9458. Note that the workaround for\nme is to use:\n\n   $ git svn clone svn+ssh://myserver/trunk/PROJ --revision=45775:HEAD\n\nBut it would be lot cleaner to have git-svn handling this properly I think.\n\nThanks,\nPascal.\n\n-- \n\n--|------------------------------------------------------\n--| Pascal Obry                           Team-Ada Member\n--| 45, rue Gabriel Peri - 78114 Magny Les Hameaux FRANCE\n--|------------------------------------------------------\n--|              http://www.obry.net\n--| \"The best way to travel is by means of imagination\"\n--|\n--| gpg --keyserver wwwkeys.pgp.net --recv-key C1082595\n"},{"id":"63928","messageId":"476BDED9.1090405@obry.net","threadId":"11314","inReplyTo":"476AD1AB.8040406@gmail.com","subject":"Re: Problem with git-svn","fromName":"Pascal Obry","fromEmail":"pascal.obry@gmail.com","sentAt":"2007-12-21T15:42:17Z","receivedAt":"2007-12-21T15:42:17Z","isPatch":false,"sender":{"key":"pascal@obry.net","avatar":"https://avatars.githubusercontent.com/u/467069?v=4"},"body":"Pascal Obry a écrit :\n> Yes part of it but before the creation of the /importfromcvs/trunk/ that\n> was moved later as /trunk/PROJ.\n\nI meant moved as /trunk/PROJ1 then /trunk/PROJ2... and so on.\n\nPascal.\n\n-- \n\n--|------------------------------------------------------\n--| Pascal Obry                           Team-Ada Member\n--| 45, rue Gabriel Peri - 78114 Magny Les Hameaux FRANCE\n--|------------------------------------------------------\n--|              http://www.obry.net\n--| \"The best way to travel is by means of imagination\"\n--|\n--| gpg --keyserver wwwkeys.pgp.net --recv-key C1082595\n"},{"id":"63978","messageId":"20071222042924.GA18812@soma","threadId":"11314","inReplyTo":"476AD1AB.8040406@gmail.com","subject":"Re: Problem with git-svn","fromName":"Eric Wong","fromEmail":"normalperson@yhbt.net","sentAt":"2007-12-22T04:29:24Z","receivedAt":"2007-12-22T04:29:24Z","isPatch":false,"sender":{"key":"e@80x24.org","avatar":null},"body":"Pascal Obry <pascal.obry@gmail.com> wrote:\n> Eric,\n> \n> > Ah, oops, I was off-by-one with the revision number.  But git-svn does\n> > look to be doing the right thing here, because it followed history into\n> > /importfromcvs/trunk/ and file.el was part of it.\n> \n> Yes part of it but before the creation of the /importfromcvs/trunk/ that\n> was moved later as /trunk/PROJ.\n> \n> < I meant moved as /trunk/PROJ1 then /trunk/PROJ2... and so on.\n>\n> In /importfromcvs/trunk/ there was many projects imported. One per one,\n> each time moving it into /trunk/PROJ.\n> \n> If I look at history of /trunk/PROJ:\n> \n>    $ svn log svn+ssh://myserver/trunk/PROJ\n> \n> The last revision is 45775, so I think git-svn should not look past this\n> revision. So I'm very surprised by the current behavior and think it is\n> a bug to import file.el at revision 9458. Note that the workaround for\n> me is to use:\n\nSince r48468 was where /importfromcvs/trunk got renamed into /trunk/PROJ\n(from your previous message http://mid.gmane.org/4764FE2C.1010103@obry.net)\n\n/importfromcvs/trunk exists at r45775, but /trunk/PROJ does not; and\ngit-svn at least follows that (which is what I suppose everybody wants).\n\nHowever...\n\nDid /importfromcvs/trunk exist all the way between r9458 and r48468?  Or\nwas that directory replaced entirely by something else along the way?\n\ngit-svn may be following copy history too aggressively, in this case.\n\nOn the other hand, this was somewhat intended because it could also\nbe a way to track merges as \"moving\" tags[1].\n\n>    $ git svn clone svn+ssh://myserver/trunk/PROJ --revision=45775:HEAD\n> \n> But it would be lot cleaner to have git-svn handling this properly I think.\n\nDoes --no-follow-parent work in your case?  Or does it go too far\nin stopping at r48468 (probably).\n\n[1] - I follow a project that has a RELEASE branch that is occasionally\ndeleted and replaced with the contents of trunk.   git-svn will actually\nimport this as a merge commit with two parents:\n\n  1. trunk (obviously)\n  2. the previous RELEASE, which was deleted\n\nThis allows old (but deleted) history to still be visible, which is what\n*I* always want.  However, it could cause undesired behavior in your\ncase...\n\nNote that running 'svn log <URL of #2 case>' will NOT show what git-svn\nlog will show for two; and I think it's nice that git-svn will track\nhistory that is harder to find with SVN\n\n(which would require svn log -v <URL of #2 case>@<rev>).\n\nMaybe another switch should be added (--merge-foster-parent?)\n\n-- \nEric Wong\n"},{"id":"63996","messageId":"476D2170.70902@obry.net","threadId":"11314","inReplyTo":"20071222042924.GA18812@soma","subject":"Re: Problem with git-svn","fromName":"Pascal Obry","fromEmail":"pascal.obry@gmail.com","sentAt":"2007-12-22T14:38:40Z","receivedAt":"2007-12-22T14:38:40Z","isPatch":false,"sender":{"key":"pascal@obry.net","avatar":"https://avatars.githubusercontent.com/u/467069?v=4"},"body":"Eric,\n\n> Since r48468 was where /importfromcvs/trunk got renamed into /trunk/PROJ\n> (from your previous message http://mid.gmane.org/4764FE2C.1010103@obry.net)\n> \n> /importfromcvs/trunk exists at r45775, but /trunk/PROJ does not; and\n> git-svn at least follows that (which is what I suppose everybody wants).\n\nRight.\n\n> However...\n> \n> Did /importfromcvs/trunk exist all the way between r9458 and r48468?  Or\n> was that directory replaced entirely by something else along the way?\n\nIt was replaced along the way. This very same tree /importfromcvs/trunk\nwas used to import completely unrelated projects. Then moved, so it did\nnot exist all the way.\n\nIn my case the previous version on this tree was 45546. There is nothing\nin between 45546 and 45775 for example. So looking at any revision in\nbetween return an error:\n\n$ svn log -v svn+ssh://myserver/importfromcvs/trunk@45760\nsvn: File not found: revision 45760, path '/importfromcvs/trunk'\n\n> git-svn may be following copy history too aggressively, in this case.\n\nLooks like it is the case. Hence the reported errors:\n\nW: Ignoring error from SVN, path probably does not exist: (160013):\nFilesystem has no item: File not found: revision 100, path '/trunk/PROJ'\n\nand\n\nW: Ignoring error from SVN, path probably does not exist: (160013):\nFilesystem has no item: File not found: revision 101, path\n'/importfromcvs/trunk'\n\nFor sure there was no revision 101 on /importfromcvs/trunk:\n\n$ svn log -v svn+ssh://myserver/importfromcvs/trunk@101\nsvn: File not found: revision 101, path '/importfromcvs/trunk'\n\n> On the other hand, this was somewhat intended because it could also\n> be a way to track merges as \"moving\" tags[1].\n> \n>>    $ git svn clone svn+ssh://myserver/trunk/PROJ --revision=45775:HEAD\n>>\n>> But it would be lot cleaner to have git-svn handling this properly I think.\n> \n> Does --no-follow-parent work in your case?  Or does it go too far\n> in stopping at r48468 (probably).\n\nNo it works on my case. That's what I'm using to import the directory in\ntwo steps. I just want to go to the bottom of this to see if we can\nsomehow improve git-svn.\n\n> Maybe another switch should be added (--merge-foster-parent?)\n\nI'm not sure to understand what you are proposing here. To look only at\nparents that are directly \"related\" to the current branch ?\n\nThanks,\nPascal.\n\n-- \n\n--|------------------------------------------------------\n--| Pascal Obry                           Team-Ada Member\n--| 45, rue Gabriel Peri - 78114 Magny Les Hameaux FRANCE\n--|------------------------------------------------------\n--|              http://www.obry.net\n--| \"The best way to travel is by means of imagination\"\n--|\n--| gpg --keyserver wwwkeys.pgp.net --recv-key C1082595\n"}]}