fortressforever/git-svn-sync
0
0
Fork 0
mirror of https://github.com/fortressforever/git-svn-sync.git synced 2024-11-24 21:11:28 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix silly syntax error

Browse source
This commit is contained in:
Ryan Liptak 2018-02-02 21:47:12 -08:00
parent 14fb258a66
commit 9b1378de8a
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
github-svn-mirror.sh
View file

@ -67,7 +67,7 @@ while [ $revision_to_merge -le $git_head_revision ]; do
svn merge --accept theirs-full --ignore-ancestry -c $revision_to_merge $git_location $svn_location || { report "Could not merge r$revision_to_merge ($commit_hash) from git repository to svn repository" ; exit 1; } svn merge --accept theirs-full --ignore-ancestry -c $revision_to_merge $git_location $svn_location || { report "Could not merge r$revision_to_merge ($commit_hash) from git repository to svn repository" ; exit 1; }
svn commit $svn_location -m "$commit_msg" || { report "Could not commit r$revision_to_merge ($commit_hash) to svn repository" ; exit 1; } svn commit $svn_location -m "$commit_msg" || { report "Could not commit r$revision_to_merge ($commit_hash) to svn repository" ; exit 1; }
# update after commit to avoid svn: E195020: Cannot merge into mixed-revision working copy; try updating first # update after commit to avoid svn: E195020: Cannot merge into mixed-revision working copy; try updating first
svn update $svn_location || report "Could not update svn after committing r$revision_to_merge ($commit_hash) to svn repository" ; exit 1; } svn update $svn_location || { report "Could not update svn after committing r$revision_to_merge ($commit_hash) to svn repository" ; exit 1; }
fi fi
let revision_to_merge=$revision_to_merge+1 let revision_to_merge=$revision_to_merge+1