Igor Kromin |   Consultant. Coder. Blogger. Tinkerer. Gamer.

I've written previously about how to do a one time non-standard SVN repository migration to Git which works fine if you want to move your entire SVN repo, but what if you want to move just a subfolder from SVN to Git? This is the guide for you.

Moving a single subfolder is significantly more work than moving the entire repository. Overall the steps are:
  1. Create author mapping file
  2. Clone SVN into a temporary Git repository
  3. Convert svn:ignore properties to .gitignore file
  4. Rewrite the Git index file to update subfolder paths (this is required to preserve file history)
  5. Add a remote origin in the Git repository that files are being merged into
  6. Fetch and merge the remote Git repository files from the temporary Git repository


So lets see this step-by-step. I'm going to assume the following:
 Assumptions
SVN subfolder URL: http://localhost/repos/mysvn/tags/mytag/SubFolder
Working directory: ~/temp
Git target directory: ~/mygit


Create the author mapping file. This will generate a file called authors-transform.txt which contains SVN authors with their Git author equivalents. The default value for the Git author is set to 'User <[email protected]>' so adjust that if you care about having real author information.
 Commands
cd ~/temp
svn log --quiet http://localhost/repos/mysvn/tags/mytag/SubFolder | grep "^r" | awk '{print $3" = User <[email protected]>"}' | sort | uniq > authors-transform.txt


Clone the SVN repository into a temporary Git repository and fix up remote references. Note that I set the trunk to the current directory since we are only cloning a single folder from SVN.
 Commands
git svn clone http://localhost/repos/mysvn/tags/mytag/SubFolder --trunk=. -A authors-transform.txt svngit
cd svngit
sed -i .bak -e "s|refs/remotes/origin/trunk|refs/remotes/git-svn|g" .git/config


Transform svn:ignore properties to the .gitignore file. Note this is put into a new directory that has the same name as the subfolder that was cloned.
 Commands
mkdir SubFolder
git svn show-ignore > SubFolder/.gitignore
git add SubFolder/.gitignore
git commit -m 'Convert svn:ignore properties to .gitignore.'




Rewrite the Git index so that the SubFolder appears in the correct location while preserving file history. This essentially moves all files that were cloned from SVN into a new directory called SubFolder and fixes Git history to point to the right files there. I know the documentation provides a sed example of this, however I was doing it on OS X so had to use awk instead.
 Commands
echo '{print $1"\tSubFolder/"$2}' > /tmp/prog.awk
git filter-branch --index-filter \
'git ls-files -s | awk -F"\t" -f /tmp/prog.awk | \
GIT_INDEX_FILE=$GIT_INDEX_FILE.new \
git update-index --index-info && \
if [ -f "$GIT_INDEX_FILE.new" ]; then mv "$GIT_INDEX_FILE.new" "$GIT_INDEX_FILE"; fi' \
HEAD
rm /tmp/prog.awk


In the Git directory add a remote to the temporary Git directory we just created, fetch and merge the files, then remove the remote reference.
 Commands
cd ~/mygit
git remote add SubFolder ~/temp/svngit
git fetch SubFolder
git merge SubFolder/master
git remote remove SubFolder


Now you can finally push the change to the target Git repository.
 Commands
git push


The temporary Git repository can be removed at this point.

-i

Please leave your comments or feedback below!
comments powered by Disqus
Other posts you may like...
Hi! You can search my blog here ⤵
Or browse the recent top tags...

Recent Blog Posts

Tiny Arcade revision 6 kit assembly and decal application

Jersey JAX-RS filters and interceptors execution order for a simple GET request

How to stop macOS adding shadows to window screenshots

How to run Atari Lynx games on the SNES Classic Mini

Maven dependency scopes with relation to WAR file packaging and the WEB-INF/lib directory

Hacking the Sonoff B1 WiFi LED bulb to run custom firmware

What does an idle WebLogic server run on the hour to cause a CPU spike

How to open the Sonoff B1 wifi LED bulb to access its internal circuitry

Australian release SNES mini classic unboxing and a quick play through

Troubleshooting high CPU usage for JVM threads

Recent Galleries

Atari Lynx repair - Part 5 - McWill LED screen mod installation

Atari Lynx repair - Part 4 - screen cover replacement

Atari Lynx repair - Part 2 - re-capping the motherboard

Atari Lynx repair - Part 3 - broken speaker replacement

Atari Lynx repair - Part 1 - introduction and case disassembly

Building a custom Atari Lynx game box storage shelf unit in a day

Protecting old Atari Lynx game boxes with snug fit plastic sleeves

Monument Valley 2 is released and does not disappoint

Space Food - Chocolate Ice Cream with Chocolate Chips

Legeod Star Wars AT-DP kit

Blogs and Friends

Matt Moores Blog
Georgi's FlatPress Guide
Perplexing Permutations
The Security Sleuth
Ilia Rogatchevski
Travelling Fairy

Blog Activity

Blog Activity