{"thread":{"id":"18050","subject":"git-svn woes","startedAt":"2009-02-27T20:37:16Z","lastAt":"2009-02-28T05:54:29Z","messageCount":7,"participants":["Nicolas Pitre","Deskin Miller","Ben Walton","Eric Wong","Junio C Hamano"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"106472","messageId":"alpine.LFD.2.00.0902271442270.5511@xanadu.home","threadId":"18050","inReplyTo":null,"subject":"git-svn woes","fromName":"Nicolas Pitre","fromEmail":"nico@cam.org","sentAt":"2009-02-27T20:37:16Z","receivedAt":"2009-02-27T20:37:16Z","isPatch":false,"sender":{"key":"nico@fluxnic.net","avatar":"https://avatars.githubusercontent.com/u/702790?v=4"},"body":"\nOK... I cannot pretend to be a newbie with git.  However it's the first \ntime I try git-svn and it looks like a couple basic things aren't right.\n\nI initially cloned svn://svn.berlios.de/openocd using \"git svn clone -s\".\nSo far so good.  Now I'm attempting to update using \"git svn fetch\" but \nthe operation always fails with the following error:\n\n|branch_from: /openocd/branches => /openocd/branches/xscale\n|Found possible branch point: \n|svn://svn.berlios.de/openocd/openocd/branches/xscale => \n|svn://svn.berlios.de/openocd/branches/xscale, 1231\n|Initializing parent: xscale@1231\n|Found branch parent: (xscale) 657522f3f2d1ab8b679fd5b45ce4e9ca1974af18\n|Following parent with do_switch\n|Scanning for empty symlinks, this may take a while if you have many empty files\n|You may disable this with `git config svn.brokenSymlinkWorkaround false'.\n|This may be done in a different terminal without restarting git svn\n|Malformed network data: Malformed network data at /home/nico/libexec/git-core/git-svn line 3333\n\nThing is... the repository never gets updated and by far.  According to \n\"git svn info\", the fetched revision is 1232, while a separate \nrepository using native svn claims to be at revision 1383.\n\nFurthermore, the \"git svn info\" command produces yet more errors, such \nas:\n\n|Use of uninitialized value $lc_author in concatenation (.) or string at /home/nico/libexec/git-core/git-svn line 964.\n|Use of uninitialized value $lc_rev in concatenation (.) or string at /home/nico/libexec/git-core/git-svn line 965.\n|Use of uninitialized value $t in gmtime at /home/nico/libexec/git-core/git-svn line 4743.\n|Use of uninitialized value $t in numeric comparison (<=>) at /home/nico/libexec/git-core/git-svn line 4744.\n|Use of uninitialized value $t in subtraction (-) at /home/nico/libexec/git-core/git-svn line 4745.\n|Use of uninitialized value $t in localtime at /home/nico/libexec/git-core/git-svn line 4746.\n\nThis is with git from current \"next\". I cannot spend time to try fixing \nthe issue myself (especially as I'm not familiar at all with the inner \nworkings of svn), so my only option at the moment is to give up on \ngit-svn altogether.  :-(\n\n\nNicolas\n"},{"id":"106477","messageId":"86d4c5e00902271253y50eaef01x8ca837d3a0ed7ef6@mail.gmail.com","threadId":"18050","inReplyTo":"alpine.LFD.2.00.0902271442270.5511@xanadu.home","subject":"Re: git-svn woes","fromName":"Deskin Miller","fromEmail":"deskinm@gmail.com","sentAt":"2009-02-27T20:53:10Z","receivedAt":"2009-02-27T20:53:10Z","isPatch":false,"sender":{"key":"deskinm@gmail.com","avatar":null},"body":"On Fri, Feb 27, 2009 at 15:37, Nicolas Pitre <nico@cam.org> wrote:\n>\n> OK... I cannot pretend to be a newbie with git.  However it's the first\n> time I try git-svn and it looks like a couple basic things aren't right.\n>\n> I initially cloned svn://svn.berlios.de/openocd using \"git svn clone -s\".\n> So far so good.  Now I'm attempting to update using \"git svn fetch\" but\n> the operation always fails with the following error:\n>\n> |branch_from: /openocd/branches => /openocd/branches/xscale\n> |Found possible branch point:\n> |svn://svn.berlios.de/openocd/openocd/branches/xscale =>\n> |svn://svn.berlios.de/openocd/branches/xscale, 1231\n> |Initializing parent: xscale@1231\n> |Found branch parent: (xscale) 657522f3f2d1ab8b679fd5b45ce4e9ca1974af18\n> |Following parent with do_switch\n> |Scanning for empty symlinks, this may take a while if you have many empty files\n> |You may disable this with `git config svn.brokenSymlinkWorkaround false'.\n> |This may be done in a different terminal without restarting git svn\n> |Malformed network data: Malformed network data at /home/nico/libexec/git-core/git-svn line 3333\n\nI experience the same error as you do with 1.6.2-rc2.  This error is\noccurring in the new broken-symlink-workaround code.  I'm not sure\nwhat is going on and don't have time to examine it closely, but the\nfunction where the error occurs doesn't run if the config\nsvn.brokenSymlinkWorkaround option is set false; doing so makes the\nfetch continue for me.\n\nAny ideas, Eric?\n\n> Thing is... the repository never gets updated and by far.  According to\n> \"git svn info\", the fetched revision is 1232, while a separate\n> repository using native svn claims to be at revision 1383.\n>\n> Furthermore, the \"git svn info\" command produces yet more errors, such\n> as:\n>\n> |Use of uninitialized value $lc_author in concatenation (.) or string at /home/nico/libexec/git-core/git-svn line 964.\n> |Use of uninitialized value $lc_rev in concatenation (.) or string at /home/nico/libexec/git-core/git-svn line 965.\n> |Use of uninitialized value $t in gmtime at /home/nico/libexec/git-core/git-svn line 4743.\n> |Use of uninitialized value $t in numeric comparison (<=>) at /home/nico/libexec/git-core/git-svn line 4744.\n> |Use of uninitialized value $t in subtraction (-) at /home/nico/libexec/git-core/git-svn line 4745.\n> |Use of uninitialized value $t in localtime at /home/nico/libexec/git-core/git-svn line 4746.\n>\n> This is with git from current \"next\". I cannot spend time to try fixing\n> the issue myself (especially as I'm not familiar at all with the inner\n> workings of svn), so my only option at the moment is to give up on\n> git-svn altogether.  :-(\n\nOh, don't give up quite yet :)\n\nDeskin Miler\n"},{"id":"106479","messageId":"1235768206-sup-2071@ntdws12.chass.utoronto.ca","threadId":"18050","inReplyTo":"alpine.LFD.2.00.0902271442270.5511@xanadu.home","subject":"Re: git-svn woes","fromName":"Ben Walton","fromEmail":"bwalton@artsci.utoronto.ca","sentAt":"2009-02-27T21:02:14Z","receivedAt":"2009-02-27T21:02:14Z","isPatch":false,"sender":{"key":"bdwalton@gmail.com","avatar":"https://avatars.githubusercontent.com/u/396061?v=4"},"body":"Excerpts from Nicolas Pitre's message of Fri Feb 27 15:37:16 -0500 2009:\n> |Use of uninitialized value $lc_author in concatenation (.) or string at /home/nico/libexec/git-core/git-svn line 964.\n> |Use of uninitialized value $lc_rev in concatenation (.) or string at /home/nico/libexec/git-core/git-svn line 965.\n> |Use of uninitialized value $t in gmtime at /home/nico/libexec/git-core/git-svn line 4743.\n> |Use of uninitialized value $t in numeric comparison (<=>) at /home/nico/libexec/git-core/git-svn line 4744.\n> |Use of uninitialized value $t in subtraction (-) at /home/nico/libexec/git-core/git-svn line 4745.\n> |Use of uninitialized value $t in localtime at /home/nico/libexec/git-core/git-svn line 4746.\n\nAll of the $t references are due to the patch I kicked in a few days\nback.  $t is set to the first function argument, which in this case\nwas passed as a null reference.  Should $t default to time() in this\ncircumstance?  That would match the previous behaviour when\nlocaltime(shift) was used, although it may mask errors like this...?\n\nIf so, I'll submit a small patch for that asap.\n\nAs for why it's getting a null reference if it shouldn't be, I'll\nleave that for the people that know the svn part of this.\n\nHTH.\n-Ben\n-- \nBen Walton\nSystems Programmer - CHASS\nUniversity of Toronto\nC:416.407.5610 | W:416.978.4302\n\nGPG Key Id: 8E89F6D2; Key Server: pgp.mit.edu\nContact me to arrange for a CAcert assurance meeting.\n"},{"id":"106507","messageId":"20090228033108.GB28606@dcvr.yhbt.net","threadId":"18050","inReplyTo":"86d4c5e00902271253y50eaef01x8ca837d3a0ed7ef6@mail.gmail.com","subject":"Re: git-svn woes","fromName":"Eric Wong","fromEmail":"normalperson@yhbt.net","sentAt":"2009-02-28T03:31:08Z","receivedAt":"2009-02-28T03:31:08Z","isPatch":false,"sender":{"key":"e@80x24.org","avatar":null},"body":"Deskin Miller <deskinm@gmail.com> wrote:\n> On Fri, Feb 27, 2009 at 15:37, Nicolas Pitre <nico@cam.org> wrote:\n> >\n> > OK... I cannot pretend to be a newbie with git.  However it's the first\n> > time I try git-svn and it looks like a couple basic things aren't right.\n> >\n> > I initially cloned svn://svn.berlios.de/openocd using \"git svn clone -s\".\n> > So far so good.  Now I'm attempting to update using \"git svn fetch\" but\n> > the operation always fails with the following error:\n> >\n> > |branch_from: /openocd/branches => /openocd/branches/xscale\n> > |Found possible branch point:\n> > |svn://svn.berlios.de/openocd/openocd/branches/xscale =>\n> > |svn://svn.berlios.de/openocd/branches/xscale, 1231\n> > |Initializing parent: xscale@1231\n> > |Found branch parent: (xscale) 657522f3f2d1ab8b679fd5b45ce4e9ca1974af18\n> > |Following parent with do_switch\n> > |Scanning for empty symlinks, this may take a while if you have many empty files\n> > |You may disable this with `git config svn.brokenSymlinkWorkaround false'.\n> > |This may be done in a different terminal without restarting git svn\n> > |Malformed network data: Malformed network data at /home/nico/libexec/git-core/git-svn line 3333\n> \n> I experience the same error as you do with 1.6.2-rc2.  This error is\n> occurring in the new broken-symlink-workaround code.  I'm not sure\n> what is going on and don't have time to examine it closely, but the\n> function where the error occurs doesn't run if the config\n> svn.brokenSymlinkWorkaround option is set false; doing so makes the\n> fetch continue for me.\n> \n> Any ideas, Eric?\n\nI've been poking around at this for a bit, I am pretty confused\nby this, too.  It's been a rough week, so I could be missing\nsomething obvious...\n\nJunio: since 1.6.2 might be out the door before we have time to resolve\nthis, I'm leaning towards disabling the broken-symlink-workaround by\ndefault for the release. It seems far more people are negatively\naffected by the attempted fix around this rare problem than helped.\n\n> > Thing is... the repository never gets updated and by far.  According to\n> > \"git svn info\", the fetched revision is 1232, while a separate\n> > repository using native svn claims to be at revision 1383.\n> >\n> > Furthermore, the \"git svn info\" command produces yet more errors, such\n> > as:\n> >\n> > |Use of uninitialized value $lc_author in concatenation (.) or string at /home/nico/libexec/git-core/git-svn line 964.\n> > |Use of uninitialized value $lc_rev in concatenation (.) or string at /home/nico/libexec/git-core/git-svn line 965.\n> > |Use of uninitialized value $t in gmtime at /home/nico/libexec/git-core/git-svn line 4743.\n> > |Use of uninitialized value $t in numeric comparison (<=>) at /home/nico/libexec/git-core/git-svn line 4744.\n> > |Use of uninitialized value $t in subtraction (-) at /home/nico/libexec/git-core/git-svn line 4745.\n> > |Use of uninitialized value $t in localtime at /home/nico/libexec/git-core/git-svn line 4746.\n> >\n> > This is with git from current \"next\". I cannot spend time to try fixing\n> > the issue myself (especially as I'm not familiar at all with the inner\n> > workings of svn), so my only option at the moment is to give up on\n> > git-svn altogether.  :-(\n> \n> Oh, don't give up quite yet :)\n> \n> Deskin Miler\n\n-- \nEric Wong\n"},{"id":"106508","messageId":"7vtz6fgrdi.fsf@gitster.siamese.dyndns.org","threadId":"18050","inReplyTo":"20090228033108.GB28606@dcvr.yhbt.net","subject":"Re: git-svn woes","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2009-02-28T03:41:29Z","receivedAt":"2009-02-28T03:41:29Z","isPatch":false,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Eric Wong <normalperson@yhbt.net> writes:\n\n> I've been poking around at this for a bit, I am pretty confused\n> by this, too.  It's been a rough week, so I could be missing\n> something obvious...\n>\n> Junio: since 1.6.2 might be out the door before we have time to resolve\n> this, I'm leaning towards disabling the broken-symlink-workaround by\n> default for the release. It seems far more people are negatively\n> affected by the attempted fix around this rare problem than helped.\n\nI agree that unfortunately is the message I am getting from the list ever\nsince the feature was introduced.\n"},{"id":"106510","messageId":"20090228040949.GA13863@dcvr.yhbt.net","threadId":"18050","inReplyTo":"7vtz6fgrdi.fsf@gitster.siamese.dyndns.org","subject":"Re: git-svn woes","fromName":"Eric Wong","fromEmail":"normalperson@yhbt.net","sentAt":"2009-02-28T04:09:49Z","receivedAt":"2009-02-28T04:09:49Z","isPatch":false,"sender":{"key":"e@80x24.org","avatar":null},"body":"Junio C Hamano <gitster@pobox.com> wrote:\n> Eric Wong <normalperson@yhbt.net> writes:\n> \n> > I've been poking around at this for a bit, I am pretty confused\n> > by this, too.  It's been a rough week, so I could be missing\n> > something obvious...\n> >\n> > Junio: since 1.6.2 might be out the door before we have time to resolve\n> > this, I'm leaning towards disabling the broken-symlink-workaround by\n> > default for the release. It seems far more people are negatively\n> > affected by the attempted fix around this rare problem than helped.\n> \n> I agree that unfortunately is the message I am getting from the list ever\n> since the feature was introduced.\n\nOK, here goes:\n\n>From 0985d9190d0f85b1285de4f23f87bdfd9e0c0fff Mon Sep 17 00:00:00 2001\nFrom: Eric Wong <normalperson@yhbt.net>\nDate: Fri, 27 Feb 2009 19:40:16 -0800\nSubject: [PATCH] git-svn: disable broken symlink workaround by default\n\nEven though this will break things for some extremely rare\nrepositories used by broken Windows clients, it's probably not\nworth enabling this by default as it has negatively affected\nmany more users than it has helped from what we've seen so far.\n\nThe extremely rare repositories that have broken symlinks in\nthem will be silently corrupted in import; but users can still\nreenable this option and restart the import.\n\nSigned-off-by: Eric Wong <normalperson@yhbt.net>\n---\n git-svn.perl                     |    2 +-\n t/t9131-git-svn-empty-symlink.sh |   10 ++++++++++\n 2 files changed, 11 insertions(+), 1 deletions(-)\n\ndiff --git a/git-svn.perl b/git-svn.perl\nindex 55702d0..959eb52 100755\n--- a/git-svn.perl\n+++ b/git-svn.perl\n@@ -3297,7 +3297,7 @@ sub new {\n sub _mark_empty_symlinks {\n \tmy ($git_svn, $switch_path) = @_;\n \tmy $bool = Git::config_bool('svn.brokenSymlinkWorkaround');\n-\treturn {} if (defined($bool) && ! $bool);\n+\treturn {} if (!defined($bool)) || (defined($bool) && ! $bool);\n \n \tmy %ret;\n \tmy ($rev, $cmt) = $git_svn->last_rev_commit;\ndiff --git a/t/t9131-git-svn-empty-symlink.sh b/t/t9131-git-svn-empty-symlink.sh\nindex 20529a8..8f35e29 100755\n--- a/t/t9131-git-svn-empty-symlink.sh\n+++ b/t/t9131-git-svn-empty-symlink.sh\n@@ -83,6 +83,8 @@ EOF\n '\n \n test_expect_success 'clone using git svn' 'git svn clone -r1 \"$svnrepo\" x'\n+test_expect_success 'enable broken symlink workaround' \\\n+  '(cd x && git config svn.brokenSymlinkWorkaround true)'\n test_expect_success '\"bar\" is an empty file' 'test -f x/bar && ! test -s x/bar'\n test_expect_success 'get \"bar\" => symlink fix from svn' \\\n \t\t'(cd x && git svn rebase)'\n@@ -97,4 +99,12 @@ test_expect_success 'get \"bar\" => symlink fix from svn' \\\n \t\t'(cd y && git svn rebase)'\n test_expect_success '\"bar\" does not become a symlink' '! test -L y/bar'\n \n+# svn.brokenSymlinkWorkaround is unset\n+test_expect_success 'clone using git svn' 'git svn clone -r1 \"$svnrepo\" z'\n+test_expect_success '\"bar\" is an empty file' 'test -f z/bar && ! test -s z/bar'\n+test_expect_success 'get \"bar\" => symlink fix from svn' \\\n+\t\t'(cd z && git svn rebase)'\n+test_expect_success '\"bar\" does not become a symlink' '! test -L z/bar'\n+\n+\n test_done\n-- \n1.6.2.rc2.5.g0c347\n"},{"id":"106511","messageId":"7vhc2fgl7u.fsf@gitster.siamese.dyndns.org","threadId":"18050","inReplyTo":"20090228040949.GA13863@dcvr.yhbt.net","subject":"Re: git-svn woes","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2009-02-28T05:54:29Z","receivedAt":"2009-02-28T05:54:29Z","isPatch":false,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Eric Wong <normalperson@yhbt.net> writes:\n\n> Junio C Hamano <gitster@pobox.com> wrote:\n>> Eric Wong <normalperson@yhbt.net> writes:\n>> \n>> > I've been poking around at this for a bit, I am pretty confused\n>> > by this, too.  It's been a rough week, so I could be missing\n>> > something obvious...\n>> >\n>> > Junio: since 1.6.2 might be out the door before we have time to resolve\n>> > this, I'm leaning towards disabling the broken-symlink-workaround by\n>> > default for the release. It seems far more people are negatively\n>> > affected by the attempted fix around this rare problem than helped.\n>> \n>> I agree that unfortunately is the message I am getting from the list ever\n>> since the feature was introduced.\n>\n> OK, here goes:\n\nThanks; applied together with Ben Walton's \"format_svn_date\" fix.\n"}]}