Problem Using Git with Subversion Repository

Problem Using Git with Subversion Repository

[Bryan Richardson]

Hello all,

Has anyone come across a similar problem as this?

Item already exists in filesystem: File already exists: filesystem
'/usr/local/svn/repos/my-apps/db', transaction '96-2v', path
'/app/trunk/vendor/rails/actionpack/test/fixtures/layout_tests/layouts/symlinked'
at /usr/lib/git-core/git-svn line 508

I *think* what happened is in a previous git-svn dcommit I removed the
vendor/rails directory (unfroze rails from my app) and now I'm trying
to freeze it again, in which case git-svn thinks a file needs to be
added (instead of modified) and the Subversion repository says the
file already exists.

Anyone know a way around it?!

--
Thanks!
Bryan

Re: Problem Using Git with Subversion Repository

[Eric Wong]

Bryan Richardson <btricha@gmail.com> wrote:
> Hello all,
> 
> Has anyone come across a similar problem as this?
> 
> Item already exists in filesystem: File already exists: filesystem
> '/usr/local/svn/repos/my-apps/db', transaction '96-2v', path
> '/app/trunk/vendor/rails/actionpack/test/fixtures/layout_tests/layouts/symlinked'
> at /usr/lib/git-core/git-svn line 508
> 
> I *think* what happened is in a previous git-svn dcommit I removed the
> vendor/rails directory (unfroze rails from my app) and now I'm trying
> to freeze it again, in which case git-svn thinks a file needs to be
> added (instead of modified) and the Subversion repository says the
> file already exists.

Hi Bryan,

Which version of git svn are you using?  Any chance we can take a look
at the SVN/git history to know what's going on?

Thanks.

> Anyone know a way around it?!

Can you try manually removing that file with "svn rm" and then
doing "git svn rebase" to rebase your working HEAD before trying
to dcommit?

-- 
Eric Wong