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

Fix github-svn-mirror.sh trying to merge revisions twice

Browse source 
* Now starts merging at working copy revision + 1
This commit is contained in:
squeek 2014-12-10 00:24:08 -08:00
parent 4f67b3bcdc
commit 9b7ac77151
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

@ -57,7 +57,7 @@ if [ $revisions_to_merge -le 0 ] ; then
exit 1
fi
revision_to_merge=$git_working_copy_revision
let revision_to_merge=$git_working_copy_revision+1
while [ $revision_to_merge -le $git_head_revision ]; do
commit_msg=$(svn log $git_location --xml -r $revision_to_merge | sed -n -e '/<msg>/,/<\/msg>/{ s/<msg>\(.*\)/\1/; s/\(.*\)<\/msg>/\1/; p; }')
commit_hash=$(svn propget git-commit --revprop -r $revision_to_merge $git_location 2>&-)