Re: Help with git-svn and SVN symlinks

2013-04-23 Thread Sadystio Ilmatunt 
Any update about this:

I created this simple bug test to reproduce my problem.
I tried on latest GIT, It fails.
It is really preventing me from using GitSvn.
Any help will be highly appreciated.

Let me know if you have any questions.

[GITSVN] $git --version
git version 1.8.2.GIT
[GITSVN] $git svn --version
git-svn version 1.8.2.GIT (svn 1.5.7)



#Create svn repo
cd /tmp;
mkdir git-svn-prob;
cd /tmp/git-svn-prob;
/usr/bin/svnadmin create SVNTest-repo
svn co file:///tmp/git-svn-prob/SVNTest-repo SVNTest
cd SVNTest
echo "stuff in h" > h
echo -n  "link h" > hl
svn add h hl
svn commit -m "Adding two files";

#Create GIT-svn repo
cd ..;
mkdir GITSVN
cd  GITSVN
git svn init  file:///tmp/git-svn-prob/SVNTest-repo;
git svn fetch

# In SVN Repo, Modify hl to be link from file
cd ..
cd SVNTest;
svn ps svn:special '*' hl
rm hl
ln -s h hl
svn ci -m "Exisitng file modified to be link";
cat hl; 

# Fetch latest SVN rev and see problem
cd ..
cd GITSVN;
git svn fetch;
git co git-svn -f
cat hl; 
diff hl ../SVNTest/hl  # Fails, Should succeed


--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Help with git-svn and SVN symlinks

2013-04-18 Thread Sadystio Ilmatunt 
Hi,

I have been using git-svn successfully for last 1 year.
But yesterday somebody checked in something in SVN using svn client
and It caused inconsitency in GIT-svn repository.

In one of SVN Merge commit, Some symlink files were not made "svn
special" by mistake,
So there was another SVN commit with only property change to convert
these files into symlink.
Git-svn should have picked this commit and converted these files into
symlink but I think it missed it, Now I have text files in Git
codebase instead of symlinks.
In SVN repository these files are symlinks.

How should I fix this?
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html