From 9b7ac77151b795717c495c8aa04266f65f812556 Mon Sep 17 00:00:00 2001 From: squeek Date: Wed, 10 Dec 2014 00:24:08 -0800 Subject: [PATCH] Fix github-svn-mirror.sh trying to merge revisions twice * Now starts merging at working copy revision + 1 --- github-svn-mirror.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/github-svn-mirror.sh b/github-svn-mirror.sh index ae988a0..497d26b 100755 --- a/github-svn-mirror.sh +++ b/github-svn-mirror.sh @@ -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>/{ s/\(.*\)/\1/; s/\(.*\)<\/msg>/\1/; p; }') commit_hash=$(svn propget git-commit --revprop -r $revision_to_merge $git_location 2>&-)