I have a public svn repository in google code, but locally I switched to git for various reasons. I am currently the only developer with access to the googlecode repository, so there is no need to make selections. All transactions go through the dev branch, to the main branch in svn, s git svn dcommit. Things are good. Now I am in a situation where I have some files locally in version control with git, but I DO NOT ALWAYS want them to become public.
So, I got an idea: I create a personal directory and add the svn: ignore private / * property to my svn repo. But than after
git svn dcommmit
I get the error message: Merge conflict during commit: File or directory. Deprecated try updating: the resource is out of date; try updating line 574 in / usr / local / git / libexec / git -core / git-svn
I tried to import the svn: ignore property into .git / info / exclude, but that excludes all my git files in 'private' from git, which is definitely not what I want.
[06/08/2011]
I think the error is not due to svn: ignore, it seems that git svn completely ignores svn: ignore, but because of some other but unknown reason. The question arises: is it possible to exclude paths from git svn dcommitin the same way as it is possible to exclude paths from git svn fetchwith --ignore-path
source
share