How to rescue a commit lost from SVN on 2018-04-10

We've lost commits from revisions 65976 to 65991 due to a problem in SF. Those commits remained at git repository and were backed up at https://gitlab.com/lfagundes/tiki.

This document shows how to generate a patch from that git repository and apply on SVN to recover a commit.

Make a shallow clone of the git repository

git clone --depth 20 git@gitlab.com:lfagundes/tiki.git tiki-lost
cd tiki-lost

This will fetch only 20 last revisions from master (trunk). If you need to get commits from a branch:

git remote set-branches 18.x
git fetch --depth 20 origin 18.x
git checkout 18.x

Generate a patch

Now look at the commit that was lost. Copy the SHA1 commit id of that revision, and the one before that. Then generate a patch:

# Use proper IDs below
git diff 3d4de13f3eb3c7d174add16260bc495a470b0513 b2f2899b09294990ea880bc9ec4b2e3ebe2db340 > rev65992.patch

Apply the patch

Now go to the SVN working copy and apply that patch:

patch -p1 < somewhere/tiki-lost/rev65992.patch
svn commit