KnowledgeHub
Questions
Tags
Users
Search
Alex Rivera
|
Logout
Edit Question
Title
Body
I am evaluating git-svn and trying to determine how well it will play with a particular svn repository. I am mostly concerned with getting git-svn to perform merges in such a way that the svn:mergeinfo property is correctly set in the subversion repo. Is this possible? Here is what I have done so far: # Checkout the SVN repo. $ git svn clone svn://server/project1 -T trunk -b branches -t tags # Make sure we are working on trunk. $ git reset --hard remotes/trunk # Modify the working copy. $ vim file.txt # Commit locally to the git repo. $ git commit -a # Push the commits back to the SVN server. $ git svn dcommit Committing to svn://server/project1/trunk ... M file.txt Committed r178 M file.txt r178 = b6e4a3a0c28e7b9aa71d8058d96dcfe7c8a2b349 (trunk) Now how would I go about merging that particular commit into one of the subversion branches? Again, it is very important to me that git properly set the svn:mergeinfo property when committing the change.
Tags (comma-separated)
Save Edits
Cancel