{"thread":{"id":"22126","subject":"Problem Using Git with Subversion Repository","startedAt":"2010-01-07T22:53:26Z","lastAt":"2010-01-09T06:31:30Z","messageCount":2,"participants":["Bryan Richardson","Eric Wong"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"131051","messageId":"3f81a4241001071453g24297atc1caab4a0a4ad176@mail.gmail.com","threadId":"22126","inReplyTo":null,"subject":"Problem Using Git with Subversion Repository","fromName":"Bryan Richardson","fromEmail":"btricha@gmail.com","sentAt":"2010-01-07T22:53:26Z","receivedAt":"2010-01-07T22:53:26Z","isPatch":false,"sender":{"key":"btricha@gmail.com","avatar":null},"body":"Hello all,\n\nHas anyone come across a similar problem as this?\n\nItem already exists in filesystem: File already exists: filesystem\n'/usr/local/svn/repos/my-apps/db', transaction '96-2v', path\n'/app/trunk/vendor/rails/actionpack/test/fixtures/layout_tests/layouts/symlinked'\nat /usr/lib/git-core/git-svn line 508\n\nI *think* what happened is in a previous git-svn dcommit I removed the\nvendor/rails directory (unfroze rails from my app) and now I'm trying\nto freeze it again, in which case git-svn thinks a file needs to be\nadded (instead of modified) and the Subversion repository says the\nfile already exists.\n\nAnyone know a way around it?!\n\n--\nThanks!\nBryan\n"},{"id":"131169","messageId":"20100109063130.GA2668@dcvr.yhbt.net","threadId":"22126","inReplyTo":"3f81a4241001071453g24297atc1caab4a0a4ad176@mail.gmail.com","subject":"Re: Problem Using Git with Subversion Repository","fromName":"Eric Wong","fromEmail":"normalperson@yhbt.net","sentAt":"2010-01-09T06:31:30Z","receivedAt":"2010-01-09T06:31:30Z","isPatch":false,"sender":{"key":"e@80x24.org","avatar":null},"body":"Bryan Richardson <btricha@gmail.com> wrote:\n> Hello all,\n> \n> Has anyone come across a similar problem as this?\n> \n> Item already exists in filesystem: File already exists: filesystem\n> '/usr/local/svn/repos/my-apps/db', transaction '96-2v', path\n> '/app/trunk/vendor/rails/actionpack/test/fixtures/layout_tests/layouts/symlinked'\n> at /usr/lib/git-core/git-svn line 508\n> \n> I *think* what happened is in a previous git-svn dcommit I removed the\n> vendor/rails directory (unfroze rails from my app) and now I'm trying\n> to freeze it again, in which case git-svn thinks a file needs to be\n> added (instead of modified) and the Subversion repository says the\n> file already exists.\n\nHi Bryan,\n\nWhich version of git svn are you using?  Any chance we can take a look\nat the SVN/git history to know what's going on?\n\nThanks.\n\n> Anyone know a way around it?!\n\nCan you try manually removing that file with \"svn rm\" and then\ndoing \"git svn rebase\" to rebase your working HEAD before trying\nto dcommit?\n\n-- \nEric Wong\n"}]}